removed parser

Author: juleswritescode

crates/pgt_completions/src/providers/roles.rs

@@ -292,7 +292,7 @@ mod tests {
                 QueryWithCursorPosition::cursor_marker()
             ),
             format!(
-                "revoke all on table userse from owner, {}",
+                "revoke all on table users from owner, {}",
                 QueryWithCursorPosition::cursor_marker()
             ),
         ];

crates/pgt_completions/src/relevance/filtering.rs

@@ -245,6 +245,17 @@ impl CompletionFilter<'_> {
                         WrappingClause::SetStatement => ctx
                             .before_cursor_matches_kind(&["keyword_role", "keyword_authorization"]),
 
+                        WrappingClause::RevokeStatement => {
+                            ctx.matches_ancestor_history(&["role_specification"])
+                                || ctx.node_under_cursor.as_ref().is_some_and(|k| {
+                                    k.kind() == "identifier"
+                                        && ctx.before_cursor_matches_kind(&[
+                                            "keyword_revoke",
+                                            "keyword_for",
+                                        ])
+                                })
+                        }
+
                         WrappingClause::AlterPolicy | WrappingClause::CreatePolicy => {
                             ctx.before_cursor_matches_kind(&["keyword_to"])
                                 && ctx.matches_ancestor_history(&["policy_to_role"])

crates/pgt_hover/src/hovered_node.rs

@@ -127,7 +127,7 @@ impl HoveredNode {
                 }
             }
 
-            "revoke_role" | "grant_role" | "policy_role" => {
+            "grant_role" | "policy_role" => {
                 Some(HoveredNode::Role(NodeIdentification::Name(node_content)))
             }
 
@@ -136,7 +136,7 @@ impl HoveredNode {
                 Some(HoveredNode::Column(NodeIdentification::Name(node_content)))
             }
 
-            "revoke_table" | "grant_table" => {
+            "grant_table" => {
                 if let Some(schema) = ctx.schema_or_alias_name.as_ref() {
                     Some(HoveredNode::Table(NodeIdentification::SchemaAndName((
                         schema.clone(),

crates/pgt_treesitter/src/context/base_parser.rs

@@ -14,12 +14,6 @@ impl TokenNavigator {
             .is_some_and(|c| options.contains(&c.get_word_without_quotes().as_str()))
     }
 
-    pub(crate) fn prev_matches(&self, options: &[&str]) -> bool {
-        self.previous_token
-            .as_ref()
-            .is_some_and(|t| options.contains(&t.get_word_without_quotes().as_str()))
-    }
-
     pub(crate) fn advance(&mut self) -> Option<WordWithIndex> {
         // we can't peek back n an iterator, so we'll have to keep track manually.
         self.previous_token = self.current_token.take();

crates/pgt_treesitter/src/context/mod.rs

@@ -4,14 +4,11 @@ use std::{
 };
 mod base_parser;
 mod grant_parser;
-mod revoke_parser;
 
 use crate::queries::{self, QueryResult, TreeSitterQueriesExecutor};
 use pgt_text_size::{TextRange, TextSize};
 
-use crate::context::{
-    base_parser::CompletionStatementParser, grant_parser::GrantParser, revoke_parser::RevokeParser,
-};
+use crate::context::{base_parser::CompletionStatementParser, grant_parser::GrantParser};
 
 #[derive(Debug, PartialEq, Eq, Hash, Clone)]
 pub enum WrappingClause<'a> {
@@ -34,6 +31,7 @@ pub enum WrappingClause<'a> {
     SetStatement,
     AlterRole,
     DropRole,
+    RevokeStatement,
 
     CreatePolicy,
     AlterPolicy,
@@ -198,8 +196,6 @@ impl<'a> TreesitterContext<'a> {
 
         if GrantParser::looks_like_matching_stmt(params.text) {
             ctx.gather_grant_context();
-        } else if RevokeParser::looks_like_matching_stmt(params.text) {
-            ctx.gather_revoke_context();
         } else {
             ctx.gather_tree_context();
             ctx.gather_info_from_ts_queries();
@@ -208,34 +204,6 @@ impl<'a> TreesitterContext<'a> {
         ctx
     }
 
-    fn gather_revoke_context(&mut self) {
-        let revoke_context = RevokeParser::get_context(self.text, self.position);
-
-        self.node_under_cursor = Some(NodeUnderCursor::CustomNode {
-            text: revoke_context.node_text,
-            range: revoke_context.node_range,
-            kind: revoke_context.node_kind.clone(),
-            previous_node_kind: None,
-        });
-
-        if revoke_context.node_kind == "revoke_table" {
-            self.schema_or_alias_name = revoke_context.schema_name.clone();
-        }
-
-        if revoke_context.table_name.is_some() {
-            let mut new = HashSet::new();
-            new.insert(revoke_context.table_name.unwrap());
-            self.mentioned_relations
-                .insert(revoke_context.schema_name, new);
-        }
-
-        self.wrapping_clause_type = match revoke_context.node_kind.as_str() {
-            "revoke_role" => Some(WrappingClause::ToRoleAssignment),
-            "revoke_table" => Some(WrappingClause::From),
-            _ => None,
-        };
-    }
-
     fn gather_grant_context(&mut self) {
         let grant_context = GrantParser::get_context(self.text, self.position);
 
@@ -686,6 +654,7 @@ impl<'a> TreesitterContext<'a> {
             "rename_column" => Some(WrappingClause::RenameColumn),
             "alter_table" => Some(WrappingClause::AlterTable),
             "set_statement" => Some(WrappingClause::SetStatement),
+            "revoke_statement" => Some(WrappingClause::RevokeStatement),
             "column_definitions" => Some(WrappingClause::ColumnDefinitions),
             "create_policy" => Some(WrappingClause::CreatePolicy),
             "alter_policy" => Some(WrappingClause::AlterPolicy),