[4] refactor: rename "identifier" node to "any_identifier" (#570)

juleswritescode · web-flow · commit dd3ba8210c4d · 2025-10-28T12:12:57.000+01:00
The plan is to introduce more specific nodes, such as
"column_identifier", "table_identifier" and so on, which should allow
more specific completions.
diff --git a/crates/pgt_completions/src/relevance/filtering.rs b/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)?;
 
@@ -69,8 +73,8 @@ impl CompletionFilter<'_> {
         // No autocompletions if there are two identifiers without a separator.
         if ctx.node_under_cursor.as_ref().is_some_and(|node| {
             node.prev_sibling().is_some_and(|p| {
-                (p.kind() == "identifier" || p.kind() == "object_reference")
-                    && node.kind() == "identifier"
+                (p.kind() == "any_identifier" || p.kind() == "object_reference")
+                    && node.kind() == "any_identifier"
             })
         }) {
             return None;
@@ -80,14 +84,29 @@ impl CompletionFilter<'_> {
         // `select * {}`
         if ctx.node_under_cursor.as_ref().is_some_and(|node| {
             node.prev_sibling()
-                .is_some_and(|p| (p.kind() == "all_fields") && node.kind() == "identifier")
+                .is_some_and(|p| (p.kind() == "all_fields") && node.kind() == "any_identifier")
         }) {
             return None;
         }
 
         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(_))
+                    && !ctx.matches_ancestor_history(&["insert_values", "field"])
+                    && !ctx.node_under_cursor_is_within_field_name("binary_expr_right")
+            }
+            _ => false,
+        };
+
+        if is_allowed { Some(()) } else { None }
+    }
+
     fn check_clause(&self, ctx: &TreesitterContext) -> Option<()> {
         ctx.wrapping_clause_type
             .as_ref()
@@ -254,7 +273,7 @@ impl CompletionFilter<'_> {
                         WrappingClause::RevokeStatement | WrappingClause::GrantStatement => {
                             ctx.matches_ancestor_history(&["role_specification"])
                                 || ctx.node_under_cursor.as_ref().is_some_and(|k| {
-                                    k.kind() == "identifier"
+                                    k.kind() == "any_identifier"
                                         && ctx.before_cursor_matches_kind(&[
                                             "keyword_grant",
                                             "keyword_revoke",
diff --git a/crates/pgt_hover/src/hovered_node.rs b/crates/pgt_hover/src/hovered_node.rs
@@ -32,7 +32,7 @@ impl HoveredNode {
         let under_cursor = ctx.node_under_cursor.as_ref()?;
 
         match under_cursor.kind() {
-            "identifier"
+            "any_identifier"
                 if ctx.matches_ancestor_history(&["relation", "object_reference"])
                     || ctx
                         .matches_ancestor_history(&["grantable_on_table", "object_reference"]) =>
@@ -52,7 +52,7 @@ impl HoveredNode {
                 }
             }
 
-            "identifier"
+            "any_identifier"
                 if ctx.matches_ancestor_history(&["object_reference"])
                     && ctx.wrapping_clause_type.as_ref().is_some_and(|clause| {
                         matches!(
@@ -73,7 +73,7 @@ impl HoveredNode {
                 }
             }
 
-            "identifier" if ctx.matches_ancestor_history(&["field"]) => {
+            "column_identifier" => {
                 if let Some(table_or_alias) = ctx.schema_or_alias_name.as_ref() {
                     Some(HoveredNode::Column(NodeIdentification::SchemaAndName((
                         table_or_alias.clone(),
@@ -84,7 +84,9 @@ impl HoveredNode {
                 }
             }
 
-            "identifier" if ctx.matches_ancestor_history(&["invocation", "object_reference"]) => {
+            "any_identifier"
+                if ctx.matches_ancestor_history(&["invocation", "object_reference"]) =>
+            {
                 if let Some(schema) = ctx.schema_or_alias_name.as_ref() {
                     Some(HoveredNode::Function(NodeIdentification::SchemaAndName((
                         schema.clone(),
@@ -97,7 +99,7 @@ impl HoveredNode {
                 }
             }
 
-            "identifier"
+            "any_identifier"
                 if ctx.matches_one_of_ancestors(&[
                     "alter_role",
                     "policy_to_role",
@@ -110,7 +112,7 @@ impl HoveredNode {
                 Some(HoveredNode::Role(NodeIdentification::Name(node_content)))
             }
 
-            "identifier"
+            "any_identifier"
                 if (
                     // hover over custom type in `create table` or `returns`
                     (ctx.matches_ancestor_history(&["type", "object_reference"])
diff --git a/crates/pgt_treesitter/src/context/mod.rs b/crates/pgt_treesitter/src/context/mod.rs
@@ -590,8 +590,7 @@ impl<'a> TreesitterContext<'a> {
                 // `node.child_by_field_id(..)` does not work as expected
                 let mut on_node = None;
                 for child in node.children(cursor) {
-                    // 28 is the id for "keyword_on"
-                    if child.kind_id() == 28 {
+                    if child.kind() == "keyword_on" {
                         on_node = Some(child);
                     }
                 }
@@ -620,7 +619,7 @@ impl<'a> TreesitterContext<'a> {
     /// Verifies whether the node_under_cursor has the passed in ancestors in the right order.
     /// Note that you need to pass in the ancestors in the order as they would appear in the tree:
     ///
-    /// If the tree shows `relation > object_reference > identifier` and the "identifier" is a leaf node,
+    /// If the tree shows `relation > object_reference > any_identifier` and the "any_identifier" is a leaf node,
     /// you need to pass `&["relation", "object_reference"]`.
     pub fn matches_ancestor_history(&self, expected_ancestors: &[&'static str]) -> bool {
         self.node_under_cursor.as_ref().is_some_and(|node| {
@@ -642,7 +641,7 @@ impl<'a> TreesitterContext<'a> {
     /// Verifies whether the node_under_cursor has the passed in ancestors in the right order.
     /// Note that you need to pass in the ancestors in the order as they would appear in the tree:
     ///
-    /// If the tree shows `relation > object_reference > identifier` and the "identifier" is a leaf node,
+    /// If the tree shows `relation > object_reference > any_identifier` and the "any_identifier" is a leaf node,
     /// you need to pass `&["relation", "object_reference"]`.
     pub fn matches_one_of_ancestors(&self, expected_ancestors: &[&'static str]) -> bool {
         self.node_under_cursor.as_ref().is_some_and(|node| {
@@ -663,9 +662,9 @@ impl<'a> TreesitterContext<'a> {
     ///  *   keyword_from [9..13] 'from'
     ///  *   relation [14..28] '"auth"."users"'
     ///  *     object_reference [14..28] '"auth"."users"'
-    ///  *       identifier [14..20] '"auth"'
+    ///  *       any_identifier [14..20] '"auth"'
     ///  *         . [20..21] '.'
-    ///  *       identifier [21..28] '"users"'
+    ///  *       any_identifier [21..28] '"users"'
     ///  */
     ///
     /// if node_under_cursor_is_nth_child(1) {
@@ -1132,13 +1131,13 @@ mod tests {
                 keyword_where [29..34] 'where'
                 binary_expression [35..43] 'id = @id'
                 field [35..37] 'id'
-                    identifier [35..37] 'id'
+                    any_identifier [35..37] 'id'
                 = [38..39] '='
                 field [40..43] '@id'
-                    identifier [40..43] '@id'
+                    any_identifier [40..43] '@id'
                         @ [40..41] '@'
 
-            You can see that the '@' is a child of the "identifier" but has a range smaller than its parent's.
+            You can see that the '@' is a child of the "any_identifier" but has a range smaller than its parent's.
             This would crash our context parsing because, at position 42, we weren't at the leaf node but also couldn't
             go to a child on that position.
         */
diff --git a/crates/pgt_treesitter/src/queries/insert_columns.rs b/crates/pgt_treesitter/src/queries/insert_columns.rs
@@ -7,14 +7,8 @@ use super::QueryTryFrom;
 
 static TS_QUERY: LazyLock<tree_sitter::Query> = LazyLock::new(|| {
     static QUERY_STR: &str = r#"
-    (insert
-        (object_reference)
-        (list
-            "("?
-            (column) @column
-            ","?
-            ")"?
-        )
+    (insert_columns
+        (column_identifier) @column
     )
 "#;
     tree_sitter::Query::new(&pgt_treesitter_grammar::LANGUAGE.into(), QUERY_STR)
diff --git a/crates/pgt_treesitter/src/queries/parameters.rs b/crates/pgt_treesitter/src/queries/parameters.rs
@@ -11,7 +11,7 @@ static TS_QUERY: LazyLock<tree_sitter::Query> = LazyLock::new(|| {
 [
   (field
     (field_qualifier)?
-    (identifier)
+    (column_identifier)
   ) @reference
 
   (parameter) @parameter
diff --git a/crates/pgt_treesitter/src/queries/relations.rs b/crates/pgt_treesitter/src/queries/relations.rs
@@ -11,27 +11,27 @@ static TS_QUERY: LazyLock<tree_sitter::Query> = LazyLock::new(|| {
     (relation
         (object_reference
             .
-            (identifier) @schema_or_table
+            (any_identifier) @schema_or_table
             "."?
-            (identifier)? @table
+            (any_identifier)? @table
         )+
     )
     (insert
         (object_reference
             .
-            (identifier) @schema_or_table
+            (any_identifier) @schema_or_table
             "."?
-            (identifier)? @table
+            (any_identifier)? @table
         )+
     )
     (alter_table
         (keyword_alter)
         (keyword_table)
         (object_reference
             .
-            (identifier) @schema_or_table
+            (any_identifier) @schema_or_table
             "."?
-            (identifier)? @table
+            (any_identifier)? @table
         )+
     )
 "#;
diff --git a/crates/pgt_treesitter/src/queries/select_columns.rs b/crates/pgt_treesitter/src/queries/select_columns.rs
@@ -14,7 +14,7 @@ static TS_QUERY: LazyLock<tree_sitter::Query> = LazyLock::new(|| {
                     (object_reference) @alias
                     "."
                 )?
-                (identifier) @column
+                (column_identifier) @column
             )
         )
         ","?
diff --git a/crates/pgt_treesitter/src/queries/table_aliases.rs b/crates/pgt_treesitter/src/queries/table_aliases.rs
@@ -10,12 +10,12 @@ static TS_QUERY: LazyLock<tree_sitter::Query> = LazyLock::new(|| {
     (relation
         (object_reference
             .
-            (identifier) @schema_or_table        
+            (any_identifier) @schema_or_table        
             "."?
-            (identifier)? @table
+            (any_identifier)? @table
         ) 
         (keyword_as)?
-        (identifier) @alias
+        (any_identifier) @alias
     )
 "#;
     tree_sitter::Query::new(&pgt_treesitter_grammar::LANGUAGE.into(), QUERY_STR)
diff --git a/crates/pgt_treesitter/src/queries/where_columns.rs b/crates/pgt_treesitter/src/queries/where_columns.rs
@@ -16,7 +16,7 @@ static TS_QUERY: LazyLock<tree_sitter::Query> = LazyLock::new(|| {
                         (object_reference) @alias
                         "."
                     )?
-                    (identifier) @column
+                    (column_identifier) @column
                 )
             )
         )
diff --git a/crates/pgt_treesitter_grammar/grammar.js b/crates/pgt_treesitter_grammar/grammar.js

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ impl HoveredNode {`
`32`	`32`	`let under_cursor = ctx.node_under_cursor.as_ref()?;`
`33`	`33`
`34`	`34`	`match under_cursor.kind() {`
`35`		`- "identifier"`
	`35`	`+ "any_identifier"`
`36`	`36`	`if ctx.matches_ancestor_history(&["relation", "object_reference"])`
`37`	`37`	`\|\| ctx`
`38`	`38`	`.matches_ancestor_history(&["grantable_on_table", "object_reference"]) =>`
`@@ -52,7 +52,7 @@ impl HoveredNode {`
`52`	`52`	`}`
`53`	`53`	`}`
`54`	`54`
`55`		`- "identifier"`
	`55`	`+ "any_identifier"`
`56`	`56`	`if ctx.matches_ancestor_history(&["object_reference"])`
`57`	`57`	`&& ctx.wrapping_clause_type.as_ref().is_some_and(\|clause\| {`
`58`	`58`	`matches!(`
`@@ -73,7 +73,7 @@ impl HoveredNode {`
`73`	`73`	`}`
`74`	`74`	`}`
`75`	`75`
`76`		`- "identifier" if ctx.matches_ancestor_history(&["field"]) => {`
	`76`	`+ "column_identifier" => {`
`77`	`77`	`if let Some(table_or_alias) = ctx.schema_or_alias_name.as_ref() {`
`78`	`78`	`Some(HoveredNode::Column(NodeIdentification::SchemaAndName((`
`79`	`79`	`table_or_alias.clone(),`
`@@ -84,7 +84,9 @@ impl HoveredNode {`
`84`	`84`	`}`
`85`	`85`	`}`
`86`	`86`
`87`		`- "identifier" if ctx.matches_ancestor_history(&["invocation", "object_reference"]) => {`
	`87`	`+ "any_identifier"`
	`88`	`+ if ctx.matches_ancestor_history(&["invocation", "object_reference"]) =>`
	`89`	`+ {`
`88`	`90`	`if let Some(schema) = ctx.schema_or_alias_name.as_ref() {`
`89`	`91`	`Some(HoveredNode::Function(NodeIdentification::SchemaAndName((`
`90`	`92`	`schema.clone(),`
`@@ -97,7 +99,7 @@ impl HoveredNode {`
`97`	`99`	`}`
`98`	`100`	`}`
`99`	`101`
`100`		`- "identifier"`
	`102`	`+ "any_identifier"`
`101`	`103`	`if ctx.matches_one_of_ancestors(&[`
`102`	`104`	`"alter_role",`
`103`	`105`	`"policy_to_role",`
`@@ -110,7 +112,7 @@ impl HoveredNode {`
`110`	`112`	`Some(HoveredNode::Role(NodeIdentification::Name(node_content)))`
`111`	`113`	`}`
`112`	`114`
`113`		`- "identifier"`
	`115`	`+ "any_identifier"`
`114`	`116`	`if (`
`115`	`117`	// hover over custom type in `create table` or `returns`
`116`	`118`	`(ctx.matches_ancestor_history(&["type", "object_reference"])`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ static TS_QUERY: LazyLock<tree_sitter::Query> = LazyLock::new(\|\| {`
`11`	`11`	`[`
`12`	`12`	`(field`
`13`	`13`	`(field_qualifier)?`
`14`		`- (identifier)`
	`14`	`+ (column_identifier)`
`15`	`15`	`) @reference`
`16`	`16`
`17`	`17`	`(parameter) @parameter`
Original file line number	Diff line number	Diff line change
`@@ -11,27 +11,27 @@ static TS_QUERY: LazyLock<tree_sitter::Query> = LazyLock::new(\|\| {`
`11`	`11`	`(relation`
`12`	`12`	`(object_reference`
`13`	`13`	`.`
`14`		`- (identifier) @schema_or_table`
	`14`	`+ (any_identifier) @schema_or_table`
`15`	`15`	`"."?`
`16`		`- (identifier)? @table`
	`16`	`+ (any_identifier)? @table`
`17`	`17`	`)+`
`18`	`18`	`)`
`19`	`19`	`(insert`
`20`	`20`	`(object_reference`
`21`	`21`	`.`
`22`		`- (identifier) @schema_or_table`
	`22`	`+ (any_identifier) @schema_or_table`
`23`	`23`	`"."?`
`24`		`- (identifier)? @table`
	`24`	`+ (any_identifier)? @table`
`25`	`25`	`)+`
`26`	`26`	`)`
`27`	`27`	`(alter_table`
`28`	`28`	`(keyword_alter)`
`29`	`29`	`(keyword_table)`
`30`	`30`	`(object_reference`
`31`	`31`	`.`
`32`		`- (identifier) @schema_or_table`
	`32`	`+ (any_identifier) @schema_or_table`
`33`	`33`	`"."?`
`34`		`- (identifier)? @table`
	`34`	`+ (any_identifier)? @table`
`35`	`35`	`)+`
`36`	`36`	`)`
`37`	`37`	`"#;`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ static TS_QUERY: LazyLock<tree_sitter::Query> = LazyLock::new(\|\| {`
`14`	`14`	`(object_reference) @alias`
`15`	`15`	`"."`
`16`	`16`	`)?`
`17`		`- (identifier) @column`
	`17`	`+ (column_identifier) @column`
`18`	`18`	`)`
`19`	`19`	`)`
`20`	`20`	`","?`
Original file line number	Diff line number	Diff line change
`@@ -10,12 +10,12 @@ static TS_QUERY: LazyLock<tree_sitter::Query> = LazyLock::new(\|\| {`
`10`	`10`	`(relation`
`11`	`11`	`(object_reference`
`12`	`12`	`.`
`13`		`- (identifier) @schema_or_table`
	`13`	`+ (any_identifier) @schema_or_table`
`14`	`14`	`"."?`
`15`		`- (identifier)? @table`
	`15`	`+ (any_identifier)? @table`
`16`	`16`	`)`
`17`	`17`	`(keyword_as)?`
`18`		`- (identifier) @alias`
	`18`	`+ (any_identifier) @alias`
`19`	`19`	`)`
`20`	`20`	`"#;`
`21`	`21`	`tree_sitter::Query::new(&pgt_treesitter_grammar::LANGUAGE.into(), QUERY_STR)`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ static TS_QUERY: LazyLock<tree_sitter::Query> = LazyLock::new(\|\| {`
`16`	`16`	`(object_reference) @alias`
`17`	`17`	`"."`
`18`	`18`	`)?`
`19`		`- (identifier) @column`
	`19`	`+ (column_identifier) @column`
`20`	`20`	`)`
`21`	`21`	`)`
`22`	`22`	`)`