many changes

Author: juleswritescode

crates/pgls_completions/src/providers/columns.rs

@@ -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/relevance/filtering.rs

@@ -45,11 +45,7 @@ impl CompletionFilter<'_> {
             return None;
         }
 
-        if ctx
-            .get_node_under_cursor_content()
-            .is_some_and(|c| is_sanitized_token(c.as_str()))
-            && ctx.before_cursor_matches_kind(&["ERROR"])
-        {
+        if ctx.before_cursor_matches_kind(&["ERROR"]) {
             return None;
         }
 

crates/pgls_completions/src/relevance/scoring.rs

@@ -142,15 +142,21 @@ impl CompletionScore<'_> {
             },
         };
 
-        match fz_matcher.fuzzy_match(
-            check_against.to_ascii_lowercase().as_str(),
-            content.to_ascii_lowercase().as_str(),
-        ) {
+        let content_lower = content.to_ascii_lowercase();
+        let check_against_lower = check_against.to_ascii_lowercase();
+
+        match fz_matcher.fuzzy_match(check_against_lower.as_str(), content_lower.as_str()) {
             Some(score) => {
-                let scorei32: i32 = score
+                let mut scorei32: i32 = score
                     .try_into()
                     .expect("The length of the input exceeds i32 capacity");
 
+                // give a significant bonus for prefix matches since these are much more
+                // likely what the user is looking for
+                if check_against_lower.starts_with(&content_lower) {
+                    scorei32 += 20;
+                }
+
                 // the scoring value isn't linear.
                 // here are a couple of samples:
                 // - item: bytea_string_agg_transfn, input: n, score: 15

crates/pgls_completions/src/snapshots/pgls_completions__test_helper__does_not_complete_cols_in_join_clauses.snap

@@ -69,10 +69,10 @@ select u.uid, p.content from a|
 
 Results:
 auth - auth (Schema)
-information_schema - information_schema (Schema)
-pg_catalog - pg_catalog (Schema)
-pg_toast - pg_toast (Schema)
 information_schema.administrable_role_authorizations - information_schema.administrable_role_authorizations (Table)
+information_schema.applicable_roles - information_schema.applicable_roles (Table)
+information_schema.attributes - information_schema.attributes (Table)
+information_schema - information_schema (Schema)
 
 --------------
 
@@ -111,10 +111,10 @@ select u.uid, p.content from auth.users u join a|
 
 Results:
 auth - auth (Schema)
-information_schema - information_schema (Schema)
-pg_catalog - pg_catalog (Schema)
-pg_toast - pg_toast (Schema)
 information_schema.administrable_role_authorizations - information_schema.administrable_role_authorizations (Table)
+information_schema.applicable_roles - information_schema.applicable_roles (Table)
+information_schema.attributes - information_schema.attributes (Table)
+information_schema - information_schema (Schema)
 
 --------------
 

crates/pgls_completions/src/snapshots/pgls_completions__test_helper__prefers_not_mentioned_columns.snap

@@ -135,11 +135,11 @@ o.a - public.one.a (Column)
 select o.id, a, b, c, d| from public.one o join public.two on o.id = t.id;
 
 Results:
-id - public.two.id (Column)
 d - public.two.d (Column)
-o.id - public.one.id (Column)
+id - public.two.id (Column)
 data - pg_catalog.pg_largeobject.data (Column)
 data_type - pg_catalog.pg_sequences.data_type (Column)
+database - pg_catalog.pg_hba_file_rules.database (Column)
 
 --------------
 

crates/pgls_completions/src/snapshots/pgls_completions__test_helper__suggests_columns_in_alter_table_and_drop_table.snap

@@ -34,9 +34,9 @@ alter table i|
 
 Results:
 instruments - public.instruments (Table)
-public - public (Schema)
 information_schema - information_schema (Schema)
 information_schema.information_schema_catalog_name - information_schema.information_schema_catalog_name (Table)
+public - public (Schema)
 pg_catalog.pg_ident_file_mappings - pg_catalog.pg_ident_file_mappings (Table)
 
 --------------
@@ -112,87 +112,9 @@ alter table i|
 
 Results:
 instruments - public.instruments (Table)
-public - public (Schema)
 information_schema - information_schema (Schema)
 information_schema.information_schema_catalog_name - information_schema.information_schema_catalog_name (Table)
-pg_catalog.pg_ident_file_mappings - pg_catalog.pg_ident_file_mappings (Table)
-
---------------
-
-alter table instruments |
-alter table instruments d|
-alter table instruments drop |
-
-Results:
-created_at - public.instruments.created_at (Column)
-id - public.instruments.id (Column)
-name - public.instruments.name (Column)
-z - public.instruments.z (Column)
-abbrev - pg_catalog.pg_timezone_abbrevs.abbrev (Column)
-
---------------
-
-alter table instruments drop c|
-
-Results:
-created_at - public.instruments.created_at (Column)
-cache_size - pg_catalog.pg_sequences.cache_size (Column)
-calls - pg_catalog.pg_stat_user_functions.calls (Column)
-castcontext - pg_catalog.pg_cast.castcontext (Column)
-castfunc - pg_catalog.pg_cast.castfunc (Column)
-
---------------
-
-alter table instruments drop column |
-
-Results:
-created_at - public.instruments.created_at (Column)
-id - public.instruments.id (Column)
-name - public.instruments.name (Column)
-z - public.instruments.z (Column)
-abbrev - pg_catalog.pg_timezone_abbrevs.abbrev (Column)
-
---------------
-
-alter table instruments drop column n|
-
-Results:
-name - public.instruments.name (Column)
-n_dead_tup - pg_catalog.pg_stat_all_tables.n_dead_tup (Column)
-n_distinct - pg_catalog.pg_stats.n_distinct (Column)
-n_ins_since_vacuum - pg_catalog.pg_stat_all_tables.n_ins_since_vacuum (Column)
-n_live_tup - pg_catalog.pg_stat_all_tables.n_live_tup (Column)
-
---------------
-
-alter table instruments drop column name |
-
-
-
-
-***Case 3:***
-
-a|
-alter |
-alter t|
-alter table |
-
-Results:
-instruments - public.instruments (Table)
-_sqlx_migrations - public._sqlx_migrations (Table)
-information_schema - information_schema (Schema)
-pg_catalog - pg_catalog (Schema)
-pg_toast - pg_toast (Schema)
-
---------------
-
-alter table i|
-
-Results:
-instruments - public.instruments (Table)
 public - public (Schema)
-information_schema - information_schema (Schema)
-information_schema.information_schema_catalog_name - information_schema.information_schema_catalog_name (Table)
 pg_catalog.pg_ident_file_mappings - pg_catalog.pg_ident_file_mappings (Table)
 
 --------------
@@ -245,16 +167,6 @@ identity_increment - information_schema.columns.identity_increment (Column)
 
 alter table instruments drop column if |
 alter table instruments drop column if e|
-
-Results:
-created_at - public.instruments.created_at (Column)
-name - public.instruments.name (Column)
-elem_count_histogram - pg_catalog.pg_stats.elem_count_histogram (Column)
-encoding - pg_catalog.pg_database.encoding (Column)
-encrypted - pg_catalog.pg_stat_gssapi.encrypted (Column)
-
---------------
-
 alter table instruments drop column if exists |
 
 Results:
@@ -282,7 +194,7 @@ alter table instruments drop column if exists name |
 
 
 
-***Case 4:***
+***Case 3:***
 
 a|
 alter |
@@ -302,9 +214,9 @@ alter table i|
 
 Results:
 instruments - public.instruments (Table)
-public - public (Schema)
 information_schema - information_schema (Schema)
 information_schema.information_schema_catalog_name - information_schema.information_schema_catalog_name (Table)
+public - public (Schema)
 pg_catalog.pg_ident_file_mappings - pg_catalog.pg_ident_file_mappings (Table)
 
 --------------
@@ -374,7 +286,7 @@ instruments - public.instruments (Table)
 
 
 
-***Case 5:***
+***Case 4:***
 
 a|
 alter |
@@ -394,9 +306,9 @@ alter table i|
 
 Results:
 instruments - public.instruments (Table)
-public - public (Schema)
 information_schema - information_schema (Schema)
 information_schema.information_schema_catalog_name - information_schema.information_schema_catalog_name (Table)
+public - public (Schema)
 pg_catalog.pg_ident_file_mappings - pg_catalog.pg_ident_file_mappings (Table)
 
 --------------
@@ -444,7 +356,7 @@ instruments - public.instruments (Table)
 
 
 
-***Case 6:***
+***Case 5:***
 
 a|
 alter |
@@ -538,7 +450,7 @@ alter table public.instruments alter column name |
 
 
 
-***Case 7:***
+***Case 6:***
 
 a|
 alter |
@@ -558,9 +470,9 @@ alter table i|
 
 Results:
 instruments - public.instruments (Table)
-public - public (Schema)
 information_schema - information_schema (Schema)
 information_schema.information_schema_catalog_name - information_schema.information_schema_catalog_name (Table)
+public - public (Schema)
 pg_catalog.pg_ident_file_mappings - pg_catalog.pg_ident_file_mappings (Table)
 
 --------------
@@ -594,7 +506,7 @@ alter table instruments alter name |
 
 
 
-***Case 8:***
+***Case 7:***
 
 a|
 alter |
@@ -614,9 +526,9 @@ alter table i|
 
 Results:
 instruments - public.instruments (Table)
-public - public (Schema)
 information_schema - information_schema (Schema)
 information_schema.information_schema_catalog_name - information_schema.information_schema_catalog_name (Table)
+public - public (Schema)
 pg_catalog.pg_ident_file_mappings - pg_catalog.pg_ident_file_mappings (Table)
 
 --------------
@@ -654,7 +566,7 @@ alter table instruments rename name to new_col |
 
 
 
-***Case 9:***
+***Case 8:***
 
 a|
 alter |

crates/pgls_completions/src/snapshots/pgls_completions__test_helper__suggests_columns_in_insert_clause.snap

@@ -39,9 +39,9 @@ insert into i|
 
 Results:
 instruments - public.instruments (Table)
-public - public (Schema)
 information_schema - information_schema (Schema)
 information_schema.information_schema_catalog_name - information_schema.information_schema_catalog_name (Table)
+public - public (Schema)
 pg_catalog.pg_ident_file_mappings - pg_catalog.pg_ident_file_mappings (Table)
 
 --------------
@@ -145,9 +145,9 @@ insert into i|
 
 Results:
 instruments - public.instruments (Table)
-public - public (Schema)
 information_schema - information_schema (Schema)
 information_schema.information_schema_catalog_name - information_schema.information_schema_catalog_name (Table)
+public - public (Schema)
 pg_catalog.pg_ident_file_mappings - pg_catalog.pg_ident_file_mappings (Table)
 
 --------------

crates/pgls_completions/src/snapshots/pgls_completions__test_helper__suggests_columns_in_where_clause.snap

@@ -22,16 +22,6 @@ create table others (
 
 select name from instruments i join others o on i.z = o.a |
 select name from instruments i join others o on i.z = o.a w|
-
-Results:
-wait_event - pg_catalog.pg_stat_activity.wait_event (Column)
-wait_event_type - pg_catalog.pg_stat_activity.wait_event_type (Column)
-waitstart - pg_catalog.pg_locks.waitstart (Column)
-wal_buffers_full - pg_catalog.pg_stat_wal.wal_buffers_full (Column)
-wal_bytes - pg_catalog.pg_stat_wal.wal_bytes (Column)
-
---------------
-
 select name from instruments i join others o on i.z = o.a where |
 
 Results:
@@ -69,16 +59,6 @@ pg_catalog - pg_catalog (Schema)
 select name from instruments i join others o on i.z = o.a where o.a = i.|
 select name from instruments i join others o on i.z = o.a where o.a = i.z |
 select name from instruments i join others o on i.z = o.a where o.a = i.z a|
-
-Results:
-information_schema.administrable_role_authorizations - information_schema.administrable_role_authorizations (Table)
-information_schema.applicable_roles - information_schema.applicable_roles (Table)
-information_schema.attributes - information_schema.attributes (Table)
-information_schema.collation_character_set_applicability - information_schema.collation_character_set_applicability (Table)
-pg_catalog.pg_aggregate - pg_catalog.pg_aggregate (Table)
-
---------------
-
 select name from instruments i join others o on i.z = o.a where o.a = i.z and |
 **should prioritize columns that aren't already mentioned**
 

todo.txt

@@ -7,10 +7,10 @@
 - [x] crates/pgls_completions/src/snapshots/pgls_completions__test_helper__filters_out_by_aliases_in_join_on.snap
 - [x] crates/pgls_completions/src/snapshots/pgls_completions__test_helper__filters_out_by_aliases_in_select.snap
 - [x] crates/pgls_completions/src/snapshots/pgls_completions__test_helper__handles_nested_queries.snap
-- [ ] crates/pgls_completions/src/snapshots/pgls_completions__test_helper__ignores_cols_in_from_clause.snap
-- [ ] crates/pgls_completions/src/snapshots/pgls_completions__test_helper__prefers_columns_of_mentioned_tables.snap
-- [ ] crates/pgls_completions/src/snapshots/pgls_completions__test_helper__prefers_not_mentioned_columns.snap
-- [ ] crates/pgls_completions/src/snapshots/pgls_completions__test_helper__shows_multiple_columns_if_no_relation_specified.snap
+- [x] crates/pgls_completions/src/snapshots/pgls_completions__test_helper__ignores_cols_in_from_clause.snap
+- [x] crates/pgls_completions/src/snapshots/pgls_completions__test_helper__prefers_columns_of_mentioned_tables.snap
+- [x] crates/pgls_completions/src/snapshots/pgls_completions__test_helper__prefers_not_mentioned_columns.snap
+- [x] crates/pgls_completions/src/snapshots/pgls_completions__test_helper__shows_multiple_columns_if_no_relation_specified.snap
 - [ ] crates/pgls_completions/src/snapshots/pgls_completions__test_helper__suggests_columns_in_alter_table_and_drop_table.snap
 - [ ] crates/pgls_completions/src/snapshots/pgls_completions__test_helper__suggests_columns_in_insert_clause.snap
 - [ ] crates/pgls_completions/src/snapshots/pgls_completions__test_helper__suggests_columns_in_where_clause.snap