ok so far

crates/pgt_completions/src/providers/policies.rs

@@ -80,6 +80,21 @@ mod tests {
 
  pool.execute(setup).await.unwrap();
 
+ assert_complete_results(
+ format!(
+ "alter policy \"{}",
+ QueryWithCursorPosition::cursor_marker()
+ )
+ .as_str(),
+ vec![
+ CompletionAssertion::Label("read for public users disallowed".into()),
+ CompletionAssertion::Label("write for public users allowed".into()),
+ ],
+ None,
+ &pool,
+ )
+ .await;
+
  assert_complete_results(
  format!(
  "alter policy \"{}\" on private.users;",

crates/pgt_completions/src/relevance/filtering.rs

@@ -233,8 +233,8 @@ impl CompletionFilter<'_> {
  matches!(
  clause,
  // not CREATE – there can't be existing policies.
- WrappingClause::DropPolicy | WrappingClause::AlterPolicy
- )
+ WrappingClause::AlterPolicy | WrappingClause::DropPolicy
+ ) && ctx.before_cursor_matches_kind(&["keyword_policy", "keyword_exists"])
  }
 
  CompletionRelevanceData::Role(_) => match clause {
@@ -247,6 +247,7 @@ impl CompletionFilter<'_> {
 
  WrappingClause::AlterPolicy | WrappingClause::CreatePolicy => {
  ctx.before_cursor_matches_kind(&["keyword_to"])
+ && ctx.matches_ancestor_history(&["policy_to_role"])
  }
 
  _ => false,

crates/pgt_completions/src/relevance/scoring.rs

@@ -126,6 +126,9 @@ impl CompletionScore<'_> {
  WrappingClause::Join { .. } if !has_mentioned_schema => 15,
  WrappingClause::Update if !has_mentioned_schema => 15,
  WrappingClause::Delete if !has_mentioned_schema => 15,
+ WrappingClause::AlterPolicy if !has_mentioned_schema => 15,
+ WrappingClause::DropPolicy if !has_mentioned_schema => 15,
+ WrappingClause::CreatePolicy if !has_mentioned_schema => 15,
  _ => -50,
  },
  CompletionRelevanceData::Policy(_) => match clause_type {

crates/pgt_hover/src/hovered_node.rs

@@ -86,7 +86,7 @@ impl HoveredNode {
  )))
  }
  }
- "identifier" if ctx.matches_ancestor_history(&["alter_role"]) => {
+ "identifier" if ctx.matches_one_of_ancestors(&["alter_role", "policy_to_role"]) => {
  Some(HoveredNode::Role(NodeIdentification::Name(node_content)))
  }
 

crates/pgt_treesitter/src/context/mod.rs

@@ -756,6 +756,22 @@ impl<'a> TreesitterContext<'a> {
  })
  }
 
+ /// Verifies whether the node_under_cursor has the passed in ancestors in the right order.
+ /// Note that you need to pass in the ancestors in the order as they would appear in the tree:
+ ///
+ /// If the tree shows `relation > object_reference > identifier` and the "identifier" is a leaf node,
+ /// you need to pass `&["relation", "object_reference"]`.
+ pub fn matches_one_of_ancestors(&self, expected_ancestors: &[&'static str]) -> bool {
+ self.node_under_cursor
+ .as_ref()
+ .is_some_and(|under_cursor| match under_cursor {
+ NodeUnderCursor::TsNode(node) => node
+ .parent()
+ .is_some_and(|p| expected_ancestors.contains(&p.kind())),
+ NodeUnderCursor::CustomNode { .. } => false,
+ })
+ }
+
  /// Checks whether the Node under the cursor is the nth child of the parent.
  ///
  /// ```

crates/pgt_treesitter_grammar/grammar.js

@@ -1034,59 +1034,56 @@ module.exports = grammar({
  )
  )
  ),
- optional(
- seq(
- $.keyword_to,
- comma_list(
- choice(
- $.identifier,
- $.keyword_public,
- $.keyword_current_user,
- $.keyword_current_role
- ),
- true
- )
- )
- ),
+ optional($.policy_to_role),
  optional($.check_or_using_clause)
  ),
 
  alter_policy: ($) =>
  seq(
- $.keyword_alter,
- $.keyword_policy,
- $.identifier,
- $.keyword_on,
- $.object_reference,
- choice(
- seq($.keyword_rename, $.keyword_to, $.identifier),
+ seq($.keyword_alter, $.keyword_policy, $.identifier),
+ optional(
  seq(
- optional(
- seq(
- $.keyword_to,
- choice(
- $.identifier,
- $.keyword_public,
- $.keyword_current_role,
- $.keyword_current_user,
- $.keyword_session_user
- )
- )
- ),
- optional($.check_or_using_clause)
+ $.keyword_on,
+ $.object_reference,
+ choice(
+ seq($.keyword_rename, $.keyword_to, $.identifier),
+ $.policy_to_role,
+ optional($.check_or_using_clause)
+ )
  )
  )
  ),
 
+ policy_to_role: ($) =>
+ seq(
+ $.keyword_to,
+ comma_list(
+ choice(
+ $.identifier,
+ $.keyword_public,
+ $.keyword_current_user,
+ $.keyword_current_role,
+ $.keyword_session_user
+ ),
+ true
+ )
+ ),
+
  drop_policy: ($) =>
  seq(
- $.keyword_drop,
- $.keyword_policy,
- optional($._if_exists),
- $.identifier,
- $.keyword_on,
- $.object_reference,
- optional(choice($.keyword_cascade, $.keyword_restrict))
+ seq(
+ $.keyword_drop,
+ $.keyword_policy,
+ optional($._if_exists),
+ $.identifier
+ ),
+ optional(
+ seq(
+ $.keyword_on,
+ $.object_reference,
+ optional(choice($.keyword_cascade, $.keyword_restrict))
+ )
+ )
  ),
 
  check_or_using_clause: ($) =>