quicksave

Author: juleswritescode

crates/pgt_completions/src/context/grant_parser.rs

@@ -86,7 +86,7 @@ impl GrantParser {
         {
             "grant" => {
                 self.context.node_range = token.get_range();
-                self.context.node_kind = "keyword_grant".into();
+                self.context.node_kind = "grant_role".into();
                 self.context.node_text = token.get_word();
             }
             "on" if !matches!(current.as_ref().map(|c| c.as_str()), Some("table")) => {
@@ -239,7 +239,7 @@ mod tests {
                 schema_name: None,
                 node_text: "REPLACED_TOKEN".into(),
                 node_range: TextRange::new(TextSize::new(19), TextSize::new(33)),
-                node_kind: "keyword_grant".into(),
+                node_kind: "grant_role".into(),
             }
         );
     }

crates/pgt_completions/src/context/mod.rs

@@ -41,7 +41,6 @@ pub enum WrappingClause<'a> {
     SetStatement,
     AlterRole,
     DropRole,
-    Grant,
 }
 
 #[derive(PartialEq, Eq, Hash, Debug, Clone)]
@@ -233,7 +232,6 @@ impl<'a> CompletionContext<'a> {
         }
 
         self.wrapping_clause_type = match grant_context.node_kind.as_str() {
-            "keyword_grant" => Some(WrappingClause::Grant),
             "grant_role" => Some(WrappingClause::ToRoleAssignment),
             "grant_table" => Some(WrappingClause::From),
             _ => None,

crates/pgt_completions/src/providers/roles.rs

@@ -179,55 +179,55 @@ mod tests {
 
     #[sqlx::test(migrator = "pgt_test_utils::MIGRATIONS")]
     async fn works_in_grant_statements(pool: PgPool) {
-        // assert_complete_results(
-        //     format!(
-        //         r#"grant select
-        //             on table public.users
-        //             to {}"#,
-        //         CURSOR_POS
-        //     )
-        //     .as_str(),
-        //     vec![
-        //         // recognizing already mentioned roles is not supported for now
-        //         CompletionAssertion::LabelAndKind("owner".into(), crate::CompletionItemKind::Role),
-        //         CompletionAssertion::LabelAndKind(
-        //             "test_login".into(),
-        //             crate::CompletionItemKind::Role,
-        //         ),
-        //         CompletionAssertion::LabelAndKind(
-        //             "test_nologin".into(),
-        //             crate::CompletionItemKind::Role,
-        //         ),
-        //     ],
-        //     None,
-        //     &pool,
-        // )
-        // .await;
+        assert_complete_results(
+            format!(
+                r#"grant select
+                    on table public.users
+                    to {}"#,
+                CURSOR_POS
+            )
+            .as_str(),
+            vec![
+                // recognizing already mentioned roles is not supported for now
+                CompletionAssertion::LabelAndKind("owner".into(), crate::CompletionItemKind::Role),
+                CompletionAssertion::LabelAndKind(
+                    "test_login".into(),
+                    crate::CompletionItemKind::Role,
+                ),
+                CompletionAssertion::LabelAndKind(
+                    "test_nologin".into(),
+                    crate::CompletionItemKind::Role,
+                ),
+            ],
+            None,
+            &pool,
+        )
+        .await;
 
-        // assert_complete_results(
-        //     format!(
-        //         r#"grant select
-        //             on table public.users
-        //             to owner, {}"#,
-        //         CURSOR_POS
-        //     )
-        //     .as_str(),
-        //     vec![
-        //         // recognizing already mentioned roles is not supported for now
-        //         CompletionAssertion::LabelAndKind("owner".into(), crate::CompletionItemKind::Role),
-        //         CompletionAssertion::LabelAndKind(
-        //             "test_login".into(),
-        //             crate::CompletionItemKind::Role,
-        //         ),
-        //         CompletionAssertion::LabelAndKind(
-        //             "test_nologin".into(),
-        //             crate::CompletionItemKind::Role,
-        //         ),
-        //     ],
-        //     None,
-        //     &pool,
-        // )
-        // .await;
+        assert_complete_results(
+            format!(
+                r#"grant select
+                    on table public.users
+                    to owner, {}"#,
+                CURSOR_POS
+            )
+            .as_str(),
+            vec![
+                // recognizing already mentioned roles is not supported for now
+                CompletionAssertion::LabelAndKind("owner".into(), crate::CompletionItemKind::Role),
+                CompletionAssertion::LabelAndKind(
+                    "test_login".into(),
+                    crate::CompletionItemKind::Role,
+                ),
+                CompletionAssertion::LabelAndKind(
+                    "test_nologin".into(),
+                    crate::CompletionItemKind::Role,
+                ),
+            ],
+            None,
+            &pool,
+        )
+        .await;
 
         assert_complete_results(
             format!(r#"grant {} to owner"#, CURSOR_POS).as_str(),

crates/pgt_completions/src/relevance/filtering.rs

@@ -179,11 +179,6 @@ impl CompletionFilter<'_> {
                         | WrappingClause::AlterRole
                         | WrappingClause::ToRoleAssignment => true,
 
-                        WrappingClause::Grant => ctx
-                            .node_under_cursor
-                            .as_ref()
-                            .is_some_and(|n| n.kind() == "keyword_grant"),
-
                         WrappingClause::SetStatement => ctx
                             .before_cursor_matches_kind(&["keyword_role", "keyword_authorization"]),