fix: many completion issues from snapshots

.github/workflows/pull_request.yml

@@ -118,13 +118,14 @@ jobs:
           path: |
             ~/.cargo/bin/tree-sitter
             ~/.cargo/bin/sqlx
+            ~/.cargo/bin/cargo-sqlx
           key: ${{ runner.os }}-tree-sitter-${{ hashFiles('rust-toolchain.toml') }}
 
       - name: Setup tree-sitter
-        run: cargo install tree-sitter-cli
+        run: command -v tree-sitter || cargo install tree-sitter-cli
 
       - name: Setup sqlx-cli
-        run: cargo install sqlx-cli
+        run: command -v sqlx ||cargo install sqlx-cli
 
       - name: Setup Bun
         uses: oven-sh/setup-bun@v2
@@ -186,7 +187,7 @@ jobs:
           key: ${{ runner.os }}-tree-sitter-${{ hashFiles('rust-toolchain.toml') }}
 
       - name: Setup Postgres
-        run: cargo install tree-sitter-cli
+        run: command -v tree-sitter || cargo install tree-sitter-cli
 
       - name: Run tests
         run: cargo test --workspace
@@ -222,24 +223,14 @@ jobs:
             ~/.cargo/bin/tree-sitter
           key: ${{ runner.os }}-tree-sitter-${{ hashFiles('rust-toolchain.toml') }}
       - name: setup tree-sitter
-        run: cargo install tree-sitter-cli
+        run: command -v tree-sitter || cargo install tree-sitter-cli
       - name: Build main binary
         run: cargo build -p pgls_cli --release
       - name: Setup Bun
         uses: oven-sh/setup-bun@v2
       - name: Install JS dependencies
         run: bun install
 
-      - name: Build backend-jsonrpc (deprecated)
-        working-directory: packages/@postgrestools/backend-jsonrpc
-        run: bun run build
-      - name: Run backend-jsonrpc test (deprecated)
-        working-directory: packages/@postgrestools/backend-jsonrpc
-        run: bun run test
-      - name: Run cli test (deprecated)
-        working-directory: packages/@postgrestools/postgrestools
-        run: bun run test
-
       - name: Build backend-jsonrpc
         working-directory: packages/@postgres-language-server/backend-jsonrpc
         run: bun run build
@@ -281,7 +272,7 @@ jobs:
             ~/.cargo/bin/tree-sitter
           key: ${{ runner.os }}-tree-sitter-${{ hashFiles('rust-toolchain.toml') }}
       - name: setup tree-sitter
-        run: cargo install tree-sitter-cli
+        run: command -v tree-sitter || cargo install tree-sitter-cli
       - name: Ensure RustFMT on nightly toolchain
         run: rustup component add rustfmt --toolchain nightly
       - name: echo toolchain

.github/workflows/release.yml

@@ -79,7 +79,7 @@ jobs:
           key: ${{ runner.os }}-tree-sitter-${{ hashFiles('rust-toolchain.toml') }}
 
       - name: Setup tree-sitter
-        run: cargo install tree-sitter-cli
+        run: command -v tree-sitter || cargo install tree-sitter-cli
 
       - name: Setup Postgres
         uses: ./.github/actions/setup-postgres

crates/pgls_completions/src/builder.rs

@@ -42,6 +42,8 @@ impl<'a> CompletionBuilder<'a> {
             item.score.calc_score(self.ctx);
         }
 
+        items.retain(|i| !i.score.should_skip());
+
         items.sort_by(|a, b| {
             b.score
                 .get_score()

crates/pgls_completions/src/providers/columns.rs

@@ -79,12 +79,12 @@ mod tests {
         TestCompletionsCase::new()
         .inside_static_statement(r#"
             select * from (
-                <sql>
+                <sql> from private.audio_books
             ) as subquery
             join public.users u
             on u.id = subquery.id;
             "#)
-            .type_sql("select id, narrator_id<1> from private.audio_books")
+            .type_sql("select id, narrator_id<1>")
             .comment("Should prefer the one from private.audio_audiobooks, since the other tables are out of scope.")
         )
             .snapshot("handles_nested_queries")
@@ -439,9 +439,9 @@ mod tests {
                         "select name from instruments i join others o on i.z = o.a <sql>",
                     )
                     .type_sql("where o.<1>a = <2>i.z and <3>i.id > 5;")
-                .comment("should respect alias speciifcation")
-                .comment("should not prioritize suggest columns or schemas (right side of binary expression)")
-                .comment("should prioritize columns that aren't already mentioned")
+                    .comment("should respect alias speciifcation")
+                    .comment("should not prioritize suggest columns or schemas (right side of binary expression)")
+                    .comment("should prioritize columns that aren't already mentioned"),
             )
             .snapshot("suggests_columns_in_where_clause")
             .await;
@@ -459,9 +459,6 @@ mod tests {
         "#;
 
         TestCompletionsSuite::new(&pool, Some(setup))
-            .with_case(
-                TestCompletionsCase::new().type_sql("alter table instruments drop column name"),
-            )
             .with_case(
                 TestCompletionsCase::new().type_sql("alter table instruments drop column name"),
             )

crates/pgls_completions/src/providers/schemas.rs

@@ -59,7 +59,8 @@ mod tests {
         assert_complete_results(
             format!("select * from {}", QueryWithCursorPosition::cursor_marker()).as_str(),
             vec![
-                CompletionAssertion::LabelAndKind("public".to_string(), CompletionItemKind::Schema),
+                // users table still preferred over schemas
+                CompletionAssertion::LabelAndKind("users".to_string(), CompletionItemKind::Table),
                 CompletionAssertion::LabelAndKind("auth".to_string(), CompletionItemKind::Schema),
                 CompletionAssertion::LabelAndKind(
                     "internal".to_string(),
@@ -69,8 +70,7 @@ mod tests {
                     "private".to_string(),
                     CompletionItemKind::Schema,
                 ),
-                // users table still preferred over system schemas
-                CompletionAssertion::LabelAndKind("users".to_string(), CompletionItemKind::Table),
+                // system schemas have lowest preference
                 CompletionAssertion::LabelAndKind(
                     "information_schema".to_string(),
                     CompletionItemKind::Schema,
@@ -110,8 +110,8 @@ mod tests {
             )
             .as_str(),
             vec![
-                CompletionAssertion::LabelAndKind("users".into(), CompletionItemKind::Table),
                 CompletionAssertion::LabelAndKind("ultimate".into(), CompletionItemKind::Schema),
+                CompletionAssertion::LabelAndKind("users".into(), CompletionItemKind::Table),
             ],
             Some(setup),
             &pool,

crates/pgls_completions/src/providers/tables.rs

@@ -273,8 +273,8 @@ mod tests {
         assert_complete_results(
             format!("update {}", QueryWithCursorPosition::cursor_marker()).as_str(),
             vec![CompletionAssertion::LabelAndKind(
-                "public".into(),
-                CompletionItemKind::Schema,
+                "coos".into(),
+                CompletionItemKind::Table,
             )],
             None,
             &pool,
@@ -354,10 +354,10 @@ mod tests {
 
         assert_complete_results(
             format!("delete from {}", QueryWithCursorPosition::cursor_marker()).as_str(),
-            vec![
-                CompletionAssertion::LabelAndKind("public".into(), CompletionItemKind::Schema),
-                CompletionAssertion::LabelAndKind("coos".into(), CompletionItemKind::Table),
-            ],
+            vec![CompletionAssertion::LabelAndKind(
+                "coos".into(),
+                CompletionItemKind::Table,
+            )],
             None,
             &pool,
         )
@@ -418,8 +418,13 @@ mod tests {
             )
             .as_str(),
             vec![
-                CompletionAssertion::LabelAndKind("public".into(), CompletionItemKind::Schema),
                 CompletionAssertion::LabelAndKind("auth".into(), CompletionItemKind::Schema),
+                CompletionAssertion::LabelAndKind(
+                    "information_schema".into(),
+                    CompletionItemKind::Schema,
+                ),
+                CompletionAssertion::LabelAndKind("pg_catalog".into(), CompletionItemKind::Schema),
+                CompletionAssertion::LabelAndKind("pg_toast".into(), CompletionItemKind::Schema),
                 CompletionAssertion::LabelAndKind("posts".into(), CompletionItemKind::Table), // self-join
                 CompletionAssertion::LabelAndKind("users".into(), CompletionItemKind::Table),
             ],
@@ -454,7 +459,6 @@ mod tests {
         assert_complete_results(
             format!("alter table {}", QueryWithCursorPosition::cursor_marker()).as_str(),
             vec![
-                CompletionAssertion::LabelAndKind("public".into(), CompletionItemKind::Schema),
                 CompletionAssertion::LabelAndKind("auth".into(), CompletionItemKind::Schema),
                 CompletionAssertion::LabelAndKind("posts".into(), CompletionItemKind::Table),
                 CompletionAssertion::LabelAndKind("users".into(), CompletionItemKind::Table),
@@ -471,7 +475,6 @@ mod tests {
             )
             .as_str(),
             vec![
-                CompletionAssertion::LabelAndKind("public".into(), CompletionItemKind::Schema),
                 CompletionAssertion::LabelAndKind("auth".into(), CompletionItemKind::Schema),
                 CompletionAssertion::LabelAndKind("posts".into(), CompletionItemKind::Table),
                 CompletionAssertion::LabelAndKind("users".into(), CompletionItemKind::Table),
@@ -484,7 +487,6 @@ mod tests {
         assert_complete_results(
             format!("drop table {}", QueryWithCursorPosition::cursor_marker()).as_str(),
             vec![
-                CompletionAssertion::LabelAndKind("public".into(), CompletionItemKind::Schema),
                 CompletionAssertion::LabelAndKind("auth".into(), CompletionItemKind::Schema),
                 CompletionAssertion::LabelAndKind("posts".into(), CompletionItemKind::Table),
                 CompletionAssertion::LabelAndKind("users".into(), CompletionItemKind::Table),
@@ -501,7 +503,6 @@ mod tests {
             )
             .as_str(),
             vec![
-                CompletionAssertion::LabelAndKind("public".into(), CompletionItemKind::Schema),
                 CompletionAssertion::LabelAndKind("auth".into(), CompletionItemKind::Schema),
                 CompletionAssertion::LabelAndKind("posts".into(), CompletionItemKind::Table), // self-join
                 CompletionAssertion::LabelAndKind("users".into(), CompletionItemKind::Table),
@@ -529,7 +530,6 @@ mod tests {
         assert_complete_results(
             format!("insert into {}", QueryWithCursorPosition::cursor_marker()).as_str(),
             vec![
-                CompletionAssertion::LabelAndKind("public".into(), CompletionItemKind::Schema),
                 CompletionAssertion::LabelAndKind("auth".into(), CompletionItemKind::Schema),
                 CompletionAssertion::LabelAndKind("users".into(), CompletionItemKind::Table),
             ],
@@ -561,7 +561,6 @@ mod tests {
             )
             .as_str(),
             vec![
-                CompletionAssertion::LabelAndKind("public".into(), CompletionItemKind::Schema),
                 CompletionAssertion::LabelAndKind("auth".into(), CompletionItemKind::Schema),
                 CompletionAssertion::LabelAndKind("users".into(), CompletionItemKind::Table),
             ],
@@ -686,8 +685,14 @@ mod tests {
             )
             .as_str(),
             vec![
-                CompletionAssertion::LabelAndKind("public".into(), CompletionItemKind::Schema),
                 CompletionAssertion::LabelAndKind("auth".into(), CompletionItemKind::Schema),
+                CompletionAssertion::LabelAndKind(
+                    "information_schema".into(),
+                    CompletionItemKind::Schema,
+                ),
+                CompletionAssertion::LabelAndKind("pg_catalog".into(), CompletionItemKind::Schema),
+                CompletionAssertion::LabelAndKind("pg_toast".into(), CompletionItemKind::Schema),
+                CompletionAssertion::LabelAndKind("public".into(), CompletionItemKind::Schema),
             ],
             None,
             &pool,

crates/pgls_completions/src/relevance/filtering.rs

@@ -43,6 +43,10 @@ impl CompletionFilter<'_> {
             return None;
         }
 
+        if ctx.before_cursor_matches_kind(&["ERROR"]) {
+            return None;
+        }
+
         // "literal" nodes can be identfiers wrapped in quotes:
         // `select "email" from auth.users;`
         // Here, "email" is a literal node.
@@ -111,7 +115,8 @@ impl CompletionFilter<'_> {
                         "column_reference_1of1",
                         "column_reference_2of2",
                         "column_reference_3of3",
-                    ]) && !ctx.node_under_cursor_is_within_field(&["binary_expr_right"])
+                    ]) && (!ctx.node_under_cursor_is_within_field(&["binary_expr_right"])
+                        || ctx.has_any_qualifier())
                 }
 
                 CompletionRelevanceData::Schema(_) => ctx.node_under_cursor_is_within_field(&[
@@ -138,17 +143,23 @@ impl CompletionFilter<'_> {
                     ]) && matches!(f.kind, ProcKind::Aggregate))
                 }
 
-                CompletionRelevanceData::Table(_) => ctx.node_under_cursor_is_within_field(&[
-                    "object_reference_1of1",
-                    "object_reference_1of2",
-                    "object_reference_2of2",
-                    "object_reference_2of3",
-                    "table_reference_1of1",
-                    "column_reference_1of1",
-                    "column_reference_1of2",
-                    "column_reference_2of2",
-                ]),
-
+                CompletionRelevanceData::Table(_) => {
+                    ctx.node_under_cursor_is_within_field(&[
+                        "object_reference_1of1",
+                        "object_reference_1of2",
+                        "object_reference_2of2",
+                        "object_reference_2of3",
+                        "table_reference_1of1",
+                        "column_reference_1of1",
+                        "column_reference_1of2",
+                        "column_reference_2of2",
+                    ]) && !ctx.history_ends_with(&[
+                        "update",
+                        "assignment",
+                        "column_reference",
+                        "any_identifier",
+                    ])
+                }
                 _ => false,
             },
 
@@ -164,7 +175,12 @@ impl CompletionFilter<'_> {
             .map(|clause| {
                 match self.data {
                     CompletionRelevanceData::Table(_) => match clause {
-                        WrappingClause::From | WrappingClause::Update => true,
+                        WrappingClause::From => true,
+
+                        WrappingClause::Update => ctx
+                            .wrapping_node_kind
+                            .as_ref()
+                            .is_none_or(|n| n != &WrappingNode::Assignment),
 
                         WrappingClause::RevokeStatement | WrappingClause::GrantStatement => ctx
                             .history_ends_with(&[