fix final stuff

Author: juleswritescode

crates/pgls_hover/src/hovered_node.rs

@@ -118,21 +118,19 @@ impl HoveredNode {
 
                     // hover over type in `select` clause etc…                    
                     || (ctx
-                        .matches_ancestor_history(&["field_qualifier", "object_reference"])
-                        && ctx.before_cursor_matches_kind(&["("])))
+                        .matches_ancestor_history(&["field_selection","composite_reference","object_reference"])
+                        && ctx.node_under_cursor_is_within_field_name(&["object_reference_1of1", "object_reference_2of2"])))
 
                     // make sure we're not checking against an alias
                     && ctx
                         .get_mentioned_table_for_alias(
-                            node_content.replace(['(', ')'], "").as_str(),
+                            node_content.as_str(),
                         )
                         .is_none() =>
             {
-                let sanitized = node_content.replace(['(', ')'], "");
-
                 Some(HoveredNode::PostgresType((
                     ctx.identifier_qualifiers.1.clone(),
-                    sanitized,
+                    node_content,
                 )))
             }
 

crates/pgls_treesitter_grammar/grammar.js

@@ -3008,7 +3008,7 @@ module.exports = grammar({
     grantables: ($) =>
       choice(
         seq(
-          seq($._grantable, comma_list($.column_identifier, false)),
+          seq($.grantable, comma_list($.column_identifier, false)),
           choice(
             $.grantable_on_table,
             $.grantable_on_function,
@@ -3018,7 +3018,7 @@ module.exports = grammar({
         comma_list($.role_identifier, true)
       ),
 
-    _grantable: ($) =>
+    grantable: ($) =>
       choice(
         comma_list(
           choice(
@@ -3041,9 +3041,7 @@ module.exports = grammar({
     grantable_on_function: ($) =>
       seq(
         $.keyword_on,
-        optional(
-          choice($.keyword_function, $.keyword_procedure, $.keyword_routine)
-        ),
+        choice($.keyword_function, $.keyword_procedure, $.keyword_routine),
         comma_list(
           seq($.function_reference, optional($.function_arguments)),
           true
@@ -3105,11 +3103,22 @@ module.exports = grammar({
           $.array,
           $.interval,
           $.between_expression,
+          $.field_selection,
           $.parenthesized_expression,
           $.object_id
         )
       ),
 
+    field_selection: ($) =>
+      seq(
+        choice($.composite_reference, $.parenthesized_expression),
+        ".",
+        $.any_identifier
+      ),
+
+    composite_reference: ($) =>
+      prec(3, wrapped_in_parenthesis($.object_reference)),
+
     parenthesized_expression: ($) =>
       prec(2, wrapped_in_parenthesis($._expression)),