ok

Author: juleswritescode

crates/pgt_completions/src/relevance/filtering.rs

@@ -69,8 +69,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,7 +80,7 @@ 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;
         }
@@ -254,7 +254,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",

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"]) => {
+            "any_identifier" if ctx.matches_ancestor_history(&["field"]) => {
                 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"])

crates/pgt_treesitter/src/context/mod.rs

@@ -620,7 +620,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 > 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 +642,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 > 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| {
@@ -1138,7 +1138,7 @@ mod tests {
                     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.
         */