column definition does not include known columns

Author: juleswritescode

crates/pgt_completions/src/relevance/filtering.rs

@@ -17,7 +17,11 @@ impl<'a> From<CompletionRelevanceData<'a>> for CompletionFilter<'a> {
 impl CompletionFilter<'_> {
     pub fn is_relevant(&self, ctx: &TreesitterContext) -> Option<()> {
         self.completable_context(ctx)?;
-        self.check_clause(ctx)?;
+
+        self.check_node_type(ctx)
+            // we want to rely on treesitter more, so checking the clause is a fallback
+            .or_else(|| self.check_clause(ctx))?;
+
         self.check_invocation(ctx)?;
         self.check_mentioned_schema_or_alias(ctx)?;
 
@@ -88,6 +92,17 @@ impl CompletionFilter<'_> {
         Some(())
     }
 
+    fn check_node_type(&self, ctx: &TreesitterContext) -> Option<()> {
+        let kind = ctx.node_under_cursor.as_ref().map(|n| n.kind())?;
+
+        let is_allowed = match kind {
+            "column_identifier" => matches!(self.data, CompletionRelevanceData::Column(_)),
+            _ => false,
+        };
+
+        if is_allowed { Some(()) } else { None }
+    }
+
     fn check_clause(&self, ctx: &TreesitterContext) -> Option<()> {
         ctx.wrapping_clause_type
             .as_ref()

crates/pgt_treesitter_grammar/grammar.js

@@ -1739,8 +1739,6 @@ module.exports = grammar({
         $.add_constraint,
         $.drop_constraint,
         $.alter_column,
-        $.modify_column,
-        $.change_column,
         $.drop_column,
         $.rename_object,
         $.rename_column,
@@ -1819,25 +1817,6 @@ module.exports = grammar({
         )
       ),
 
-    modify_column: ($) =>
-      seq(
-        $.keyword_modify,
-        optional($.keyword_column),
-        optional($._if_exists),
-        $.column_definition,
-        optional($.column_position)
-      ),
-
-    change_column: ($) =>
-      seq(
-        $.keyword_change,
-        optional($.keyword_column),
-        optional($._if_exists),
-        $.column_identifier,
-        $.column_definition,
-        optional($.column_position)
-      ),
-
     column_position: ($) =>
       choice($.keyword_first, seq($.keyword_after, $.column_identifier)),
 
@@ -2640,7 +2619,7 @@ module.exports = grammar({
 
     column_definition: ($) =>
       seq(
-        field("name", $._column),
+        $.any_identifier,
         field("type", $.type),
         repeat($._column_constraint)
       ),