chore: merge main

Author: psteinroe

.github/workflows/pull_request.yml

@@ -33,8 +33,10 @@ jobs:
     steps:
       - name: Checkout PR branch
         uses: actions/checkout@v4
+
       - name: Free Disk Space
         uses: ./.github/actions/free-disk-space
+
       - name: Install toolchain
         uses: moonrepo/setup-rust@v1
         with:
@@ -43,15 +45,23 @@ jobs:
           cache-base: main
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - name: Setup Biome
-        uses: biomejs/setup-biome@v2
-        with:
-          version: latest
+
+      - name: Setup Bun
+        uses: oven-sh/setup-bun@v2
+
+      - name: Install JS dependencies
+        run: bun install
+
+      - name: Setup Just
+        uses: extractions/setup-just@v3
+
+      - name: Echo Tool Versions
+        run: |
+          just format-ci-versions
+
       - name: Run format
         run: |
-          cargo fmt --all --check
-          taplo format --check
-          biome format
+          just format-ci
 
   actionlint:
     name: Lint GitHub Actions
@@ -96,17 +106,22 @@ jobs:
       - name: Setup sqlx-cli
         run: cargo install sqlx-cli
 
-      - name: Setup Biome
-        uses: biomejs/setup-biome@v2
-        with:
-          version: latest
+      - name: Setup Bun
+        uses: oven-sh/setup-bun@v2
+
+      - name: Install JS dependencies
+        run: bun install
+
+      - name: Setup Just
+        uses: extractions/setup-just@v3
+
+      - name: Echo Tool Versions
+        run: |
+          just lint-ci-versions
 
       - name: Run Lints
         run: |
-          cargo sqlx prepare --check --workspace
-          cargo clippy --fix
-          cargo run -p rules_check
-          biome lint --write
+          just lint-ci
 
       - name: Check for changes
         run: |

.github/workflows/release.yml

@@ -131,7 +131,7 @@ jobs:
           GITHUB_REPO: ${{ github.repository }}
 
       - name: Ensure tag matches
-        if: ${{ steps.create_changelog.outputs.version }} != ${{ needs.extract_version.outputs.version }}
+        if: steps.create_changelog.outputs.version != needs.extract_version.outputs.version
         run: exit 1
 
       - name: 👇 Download Artifacts

.sqlx/query-47bbad9dc2cec0231ef726790a9b0a5d9c628c6a2704f5523fb9ee45414350c7.json

@@ -10,7 +10,7 @@ homepage     = "https://supabase.com/"
 keywords     = ["linter", "typechecker", "postgres", "language-server"]
 license      = "MIT"
 repository   = "https://github.com/supabase-community/postgres-language-server"
-rust-version = "1.85.0"
+rust-version = "1.86.0"
 
 [workspace.dependencies]
 # supporting crates unrelated to postgres

Cargo.toml

@@ -27,10 +27,17 @@ body = """
             {{ commit.message | upper_first }}\
     {% endfor %}
 {% endfor %}\n
+
+## Contributors
+{% for contributor in github.contributors | filter(attribute="is_first_time", value=true) %}
+  * @{{ contributor.username }} made their first contribution in #{{ contributor.pr_number }} 🎉
+{%- endfor -%}
+{% for contributor in github.contributors | filter(attribute="is_first_time", value=false) %}
+  * @{{ contributor.username }}
+{%- endfor -%}\n
 """
 # template for the changelog footer
 footer = """
-<!-- generated by git-cliff -->
 """
 # remove the leading and trailing s
 trim = true

cliff.toml

@@ -18,10 +18,6 @@ pub struct CliOptions {
     #[bpaf(long("use-server"), switch, fallback(false))]
     pub use_server: bool,
 
-    /// Skip connecting to the database and only run checks that don't require a database connection.
-    #[bpaf(long("skip-db"), switch, fallback(false))]
-    pub skip_db: bool,
-
     /// Print additional diagnostics, and some diagnostics show more information. Also, print out what files were processed and which ones were modified.
     #[bpaf(long("verbose"), switch, fallback(false))]
     pub verbose: bool,

crates/pgt_cli/src/cli_options.rs

@@ -307,7 +307,6 @@ pub(crate) trait CommandRunner: Sized {
             configuration,
             vcs_base_path,
             gitignore_matches,
-            skip_db: cli_options.skip_db,
         })?;
 
         let execution = self.get_execution(cli_options, console, workspace)?;

crates/pgt_cli/src/commands/mod.rs

@@ -76,12 +76,11 @@ pub enum TraversalMode {
     Dummy,
     /// This mode is enabled when running the command `check`
     Check {
-        /// The type of fixes that should be applied when analyzing a file.
-        ///
-        /// It's [None] if the `check` command is called without `--apply` or `--apply-suggested`
-        /// arguments.
+        // The type of fixes that should be applied when analyzing a file.
+        //
+        // It's [None] if the `check` command is called without `--apply` or `--apply-suggested`
+        // arguments.
         // fix_file_mode: Option<FixFileMode>,
-
         /// An optional tuple.
         /// 1. The virtual path to the file
         /// 2. The content of the file

crates/pgt_cli/src/execute/mod.rs

@@ -1,47 +1,92 @@
-use crate::item::CompletionItem;
+use crate::{
+    CompletionItemKind, CompletionText,
+    context::CompletionContext,
+    item::CompletionItem,
+    relevance::{filtering::CompletionFilter, scoring::CompletionScore},
+};
 
-pub(crate) struct CompletionBuilder {
-    items: Vec<CompletionItem>,
+pub(crate) struct PossibleCompletionItem<'a> {
+    pub label: String,
+    pub description: String,
+    pub kind: CompletionItemKind,
+    pub score: CompletionScore<'a>,
+    pub filter: CompletionFilter<'a>,
+    pub completion_text: Option<CompletionText>,
 }
 
-impl CompletionBuilder {
-    pub fn new() -> Self {
-        CompletionBuilder { items: vec![] }
+pub(crate) struct CompletionBuilder<'a> {
+    items: Vec<PossibleCompletionItem<'a>>,
+    ctx: &'a CompletionContext<'a>,
+}
+
+impl<'a> CompletionBuilder<'a> {
+    pub fn new(ctx: &'a CompletionContext) -> Self {
+        CompletionBuilder { items: vec![], ctx }
     }
 
-    pub fn add_item(&mut self, item: CompletionItem) {
+    pub fn add_item(&mut self, item: PossibleCompletionItem<'a>) {
         self.items.push(item);
     }
 
-    pub fn finish(mut self) -> Vec<CompletionItem> {
-        self.items
-            .sort_by(|a, b| b.score.cmp(&a.score).then_with(|| a.label.cmp(&b.label)));
+    pub fn finish(self) -> Vec<CompletionItem> {
+        let mut items: Vec<PossibleCompletionItem> = self
+            .items
+            .into_iter()
+            .filter(|i| i.filter.is_relevant(self.ctx).is_some())
+            .collect();
+
+        for item in items.iter_mut() {
+            item.score.calc_score(self.ctx);
+        }
+
+        items.sort_by(|a, b| {
+            b.score
+                .get_score()
+                .cmp(&a.score.get_score())
+                .then_with(|| a.label.cmp(&b.label))
+        });
 
-        self.items.dedup_by(|a, b| a.label == b.label);
-        self.items.truncate(crate::LIMIT);
+        items.dedup_by(|a, b| a.label == b.label);
+        items.truncate(crate::LIMIT);
 
-        let should_preselect_first_item = self.should_preselect_first_item();
+        let should_preselect_first_item = should_preselect_first_item(&items);
 
-        self.items
+        /*
+         * LSP Clients themselves sort the completion items.
+         * They'll use the `sort_text` property if present (or fallback to the `label`).
+         * Since our items are already sorted, we're 'hijacking' the sort_text.
+         * We're simply adding the index of the item, padded by zeroes to the max length.
+         */
+        let max_padding = items.len().to_string().len();
+
+        items
             .into_iter()
             .enumerate()
-            .map(|(idx, mut item)| {
-                if idx == 0 {
-                    item.preselected = should_preselect_first_item;
+            .map(|(idx, item)| {
+                let preselected = idx == 0 && should_preselect_first_item;
+
+                CompletionItem {
+                    description: item.description,
+                    kind: item.kind,
+                    label: item.label,
+                    preselected,
+
+                    // wonderous Rust syntax ftw
+                    sort_text: format!("{:0>padding$}", idx, padding = max_padding),
+                    completion_text: item.completion_text,
                 }
-                item
             })
             .collect()
     }
+}
 
-    fn should_preselect_first_item(&mut self) -> bool {
-        let mut items_iter = self.items.iter();
-        let first = items_iter.next();
-        let second = items_iter.next();
+fn should_preselect_first_item(items: &Vec<PossibleCompletionItem>) -> bool {
+    let mut items_iter = items.iter();
+    let first = items_iter.next();
+    let second = items_iter.next();
 
-        first.is_some_and(|f| match second {
-            Some(s) => (f.score - s.score) > 10,
-            None => true,
-        })
-    }
+    first.is_some_and(|f| match second {
+        Some(s) => (f.score.get_score() - s.score.get_score()) > 15,
+        None => true,
+    }) && items.len() >= 10
 }

crates/pgt_completions/src/builder.rs

@@ -27,7 +27,7 @@ pub fn complete(params: CompletionParams) -> Vec<CompletionItem> {
 
     let ctx = CompletionContext::new(&sanitized_params);
 
-    let mut builder = CompletionBuilder::new();
+    let mut builder = CompletionBuilder::new(&ctx);
 
     complete_tables(&ctx, &mut builder);
     complete_functions(&ctx, &mut builder);