so far so good

Author: juleswritescode

crates/pgt_hover/src/hovered_node.rs

@@ -73,7 +73,7 @@ impl HoveredNode {
                 }
             }
 
-            "any_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(),

crates/pgt_treesitter/src/queries/parameters.rs

@@ -11,7 +11,7 @@ static TS_QUERY: LazyLock<tree_sitter::Query> = LazyLock::new(|| {
 [
   (field
     (field_qualifier)?
-    (any_identifier)
+    (column_identifier)
   ) @reference
 
   (parameter) @parameter

crates/pgt_treesitter/src/queries/select_columns.rs

@@ -14,7 +14,7 @@ static TS_QUERY: LazyLock<tree_sitter::Query> = LazyLock::new(|| {
                     (object_reference) @alias
                     "."
                 )?
-                (any_identifier) @column
+                (column_identifier) @column
             )
         )
         ","?

crates/pgt_treesitter/src/queries/where_columns.rs

@@ -16,7 +16,7 @@ static TS_QUERY: LazyLock<tree_sitter::Query> = LazyLock::new(|| {
                         (object_reference) @alias
                         "."
                     )?
-                    (any_identifier) @column
+                    (column_identifier) @column
                 )
             )
         )

crates/pgt_treesitter_grammar/grammar.js

@@ -28,6 +28,7 @@ module.exports = grammar({
     [$.time],
     [$.timestamp],
     [$.grantable_on_function, $.grantable_on_table],
+    [$.any_identifier, $.column_identifier],
   ],
 
   precedences: ($) => [
@@ -779,21 +780,7 @@ module.exports = grammar({
       ),
 
     _show_statement: ($) =>
-      seq(
-        $.keyword_show,
-        choice(
-          $._show_create,
-          $.keyword_all, // Postgres
-          $._show_tables // trino/presto
-        )
-      ),
-
-    _show_tables: ($) =>
-      seq(
-        $.keyword_tables,
-        optional(seq($.keyword_from, $._qualified_field)),
-        optional(seq($.keyword_like, $._expression))
-      ),
+      seq($.keyword_show, choice($._show_create, $.keyword_all)),
 
     _show_create: ($) =>
       seq(
@@ -2363,7 +2350,7 @@ module.exports = grammar({
 
     _column_list: ($) => paren_list(alias($._column, $.column), true),
     _column: ($) =>
-      choice($.any_identifier, alias($._literal_string, $.literal)),
+      choice($.column_identifier, alias($._literal_string, $.literal)),
 
     _update_statement: ($) => seq($.update, optional($.returning)),
 
@@ -2834,10 +2821,10 @@ module.exports = grammar({
         $.keyword_end
       ),
 
-    field: ($) => field("name", $.any_identifier),
+    field: ($) => field("name", $.column_identifier),
 
     _qualified_field: ($) =>
-      seq(optional($.field_qualifier), field("name", $.any_identifier)),
+      seq(optional($.field_qualifier), $.column_identifier),
 
     field_qualifier: ($) =>
       seq(prec.left(optional_parenthesis($.object_reference)), "."),
@@ -3531,6 +3518,8 @@ module.exports = grammar({
     bang: (_) => "!",
 
     any_identifier: ($) => $._any_identifier,
+    column_identifier: ($) => $._any_identifier,
+
     _any_identifier: ($) =>
       choice(
         $._identifier,