merged

Author: juleswritescode

crates/pgt_hover/src/hovered_node.rs

@@ -69,6 +69,17 @@ impl HoveredNode {
                 Some(HoveredNode::Column(NodeIdentification::Name(node_content)))
             }
 
+            "policy_table" | "revoke_table" | "grant_table" => {
+                if let Some(schema) = ctx.schema_or_alias_name.as_ref() {
+                    Some(HoveredNode::Table(NodeIdentification::SchemaAndName((
+                        schema.clone(),
+                        node_content,
+                    ))))
+                } else {
+                    Some(HoveredNode::Table(NodeIdentification::Name(node_content)))
+                }
+            }
+
             _ => None,
         }
     }

crates/pgt_hover/src/lib.rs

@@ -20,6 +20,10 @@ pub struct OnHoverParams<'a> {
     pub ts_tree: &'a tree_sitter::Tree,
 }
 
+#[tracing::instrument(level = "debug", skip_all, fields(
+    text = params.stmt_sql,
+    position = params.position.to_string()
+))]
 pub fn on_hover(params: OnHoverParams) -> Vec<String> {
     let ctx = pgt_treesitter::context::TreesitterContext::new(TreeSitterContextParams {
         position: params.position,

crates/pgt_hover/tests/hover_integration_tests.rs

@@ -442,3 +442,59 @@ async fn test_column_hover_with_quoted_column_name_with_table(test_db: PgPool) {
     )
     .await;
 }
+
+async fn test_policy_table_hover(test_db: PgPool) {
+    let setup = r#"
+        create table users (
+            id serial primary key,
+            name text
+        );
+    "#;
+
+    test_db.execute(setup).await.unwrap();
+
+    let query = format!(
+        r#"create policy "my cool pol" on us{}ers for all to public with check (true);"#,
+        QueryWithCursorPosition::cursor_marker()
+    );
+
+    test_hover_at_cursor("create_policy", query, None, &test_db).await;
+}
+
+#[sqlx::test(migrator = "pgt_test_utils::MIGRATIONS")]
+async fn test_revoke_table_hover(test_db: PgPool) {
+    let setup = r#"
+        create table users (
+            id serial primary key,
+            name text
+        );
+    "#;
+
+    test_db.execute(setup).await.unwrap();
+
+    let query = format!(
+        "revoke select on us{}ers from public;",
+        QueryWithCursorPosition::cursor_marker()
+    );
+
+    test_hover_at_cursor("revoke_select", query, None, &test_db).await;
+}
+
+#[sqlx::test(migrator = "pgt_test_utils::MIGRATIONS")]
+async fn test_grant_table_hover(test_db: PgPool) {
+    let setup = r#"
+        create table users (
+            id serial primary key,
+            name text
+        );
+    "#;
+
+    test_db.execute(setup).await.unwrap();
+
+    let query = format!(
+        "grant select on us{}ers to public;",
+        QueryWithCursorPosition::cursor_marker()
+    );
+
+    test_hover_at_cursor("grant_select", query, None, &test_db).await;
+}

crates/pgt_hover/tests/snapshots/create_policy.snap

@@ -0,0 +1,20 @@
+---
+source: crates/pgt_hover/tests/hover_integration_tests.rs
+expression: snapshot
+---
+# Input
+```sql
+create policy "my cool pol" on users for all to public with check (true);
+                                 ↑ hovered here
+```
+
+# Hover Results
+### `public.users` - 🔓 RLS disabled  
+```plain  
+  
+```  
+---    
+```plain  
+
+~0 rows, ~0 dead rows, 16.38 kB  
+```

crates/pgt_hover/tests/snapshots/grant_select.snap

@@ -0,0 +1,20 @@
+---
+source: crates/pgt_hover/tests/hover_integration_tests.rs
+expression: snapshot
+---
+# Input
+```sql
+grant select on users to public;
+                  ↑ hovered here
+```
+
+# Hover Results
+### `public.users` - 🔓 RLS disabled  
+```plain  
+  
+```  
+---    
+```plain  
+
+~0 rows, ~0 dead rows, 16.38 kB  
+```

crates/pgt_hover/tests/snapshots/revoke_select.snap

@@ -0,0 +1,20 @@
+---
+source: crates/pgt_hover/tests/hover_integration_tests.rs
+expression: snapshot
+---
+# Input
+```sql
+revoke select on users from public;
+                   ↑ hovered here
+```
+
+# Hover Results
+### `public.users` - 🔓 RLS disabled  
+```plain  
+  
+```  
+---    
+```plain  
+
+~0 rows, ~0 dead rows, 16.38 kB  
+```

crates/pgt_lexer/src/lexer.rs

@@ -143,7 +143,7 @@ impl<'a> Lexer<'a> {
                         }
                         _ => {}
                     };
-                    SyntaxKind::POSITIONAL_PARAM
+                    SyntaxKind::NAMED_PARAM
                 }
                 pgt_tokenizer::TokenKind::QuotedIdent { terminated } => {
                     if !terminated {

crates/pgt_lexer_codegen/src/syntax_kind.rs

@@ -65,6 +65,9 @@ pub fn syntax_kind_mod() -> proc_macro2::TokenStream {
 
     let mut enum_variants: Vec<TokenStream> = Vec::new();
     let mut from_kw_match_arms: Vec<TokenStream> = Vec::new();
+    let mut is_kw_match_arms: Vec<TokenStream> = Vec::new();
+
+    let mut is_trivia_match_arms: Vec<TokenStream> = Vec::new();
 
     // collect keywords
     for kw in &all_keywords {
@@ -78,18 +81,30 @@ pub fn syntax_kind_mod() -> proc_macro2::TokenStream {
         from_kw_match_arms.push(quote! {
             #kw => Some(SyntaxKind::#kind_ident)
         });
+        is_kw_match_arms.push(quote! {
+            SyntaxKind::#kind_ident => true
+        });
     }
 
     // collect extra keywords
     EXTRA.iter().for_each(|&name| {
         let variant_name = format_ident!("{}", name);
         enum_variants.push(quote! { #variant_name });
+
+        if name == "COMMENT" {
+            is_trivia_match_arms.push(quote! {
+                SyntaxKind::#variant_name => true
+            });
+        }
     });
 
     // collect whitespace variants
     WHITESPACE.iter().for_each(|&name| {
         let variant_name = format_ident!("{}", name);
         enum_variants.push(quote! { #variant_name });
+        is_trivia_match_arms.push(quote! {
+            SyntaxKind::#variant_name => true
+        });
     });
 
     // collect punctuations
@@ -119,6 +134,20 @@ pub fn syntax_kind_mod() -> proc_macro2::TokenStream {
                     _ => None
                 }
             }
+
+            pub fn is_keyword(&self) -> bool {
+                match self {
+                    #(#is_kw_match_arms),*,
+                    _ => false
+                }
+            }
+
+            pub fn is_trivia(&self) -> bool {
+                match self {
+                    #(#is_trivia_match_arms),*,
+                    _ => false
+                }
+            }
         }
     }
 }

crates/pgt_lsp/src/handlers/hover.rs

@@ -3,6 +3,7 @@ use tower_lsp::lsp_types::{self, MarkedString, MarkupContent};
 
 use crate::{adapters::get_cursor_position, diagnostics::LspError, session::Session};
 
+#[tracing::instrument(level = "debug", skip(session), err)]
 pub(crate) fn on_hover(
     session: &Session,
     params: lsp_types::HoverParams,

crates/pgt_query_macros/src/iter_mut.rs

@@ -19,12 +19,17 @@ pub fn iter_mut_mod(analyser: ProtoAnalyzer) -> proc_macro2::TokenStream {
 
     for node in &nodes {
         // Use the enum variant name from the Node enum
-        if let Some(variant_name) = type_to_variant.get(&node.name) {
+        if let Some(variant_name) = type_to_variant.get(&node.enum_variant_name) {
             let variant_ident = format_ident!("{}", variant_name);
             node_variant_names.push(variant_ident);
 
             let property_handlers = property_handlers(node);
             node_property_handlers.push(property_handlers);
+        } else {
+            panic!(
+                "No enum variant found for node type: {}",
+                node.enum_variant_name
+            );
         }
     }