yes

Author: juleswritescode

crates/pgt_completions/src/providers/helper.rs

@@ -15,19 +15,30 @@ pub(crate) fn find_matching_alias_for_table(
  None
 }
 
+pub(crate) fn node_text_surrounded_by_quotes(ctx: &TreesitterContext) -> bool {
+ ctx.get_node_under_cursor_content()
+ .is_some_and(|c| c.starts_with('"') && c.ends_with('"') && c != "\"\"")
+}
+
 pub(crate) fn get_range_to_replace(ctx: &TreesitterContext) -> TextRange {
  match ctx.node_under_cursor.as_ref() {
  Some(node) => {
  let content = ctx.get_node_under_cursor_content().unwrap_or("".into());
  let content = content.as_str();
 
- let length = remove_sanitized_token(content).len();
+ let sanitized = remove_sanitized_token(content);
+ let length = sanitized.len();
 
- let start = node.start_byte();
+ let mut start = node.start_byte();
  let mut end = start + length;
 
- if is_sanitized_token_with_quote(content) {
- end += 1;
+ if sanitized.starts_with('"') {
+ start += 1;
+ }
+
+ // might be '"' so we need to check for length
+ if sanitized.ends_with('"') && sanitized.len() != 1 {
+ end -= 1;
  }
 
  TextRange::new(start.try_into().unwrap(), end.try_into().unwrap())

crates/pgt_completions/src/providers/policies.rs

@@ -5,6 +5,7 @@ use pgt_treesitter::TreesitterContext;
 use crate::{
  CompletionItemKind, CompletionText,
  builder::{CompletionBuilder, PossibleCompletionItem},
+ providers::helper::node_text_surrounded_by_quotes,
  relevance::{CompletionRelevanceData, filtering::CompletionFilter, scoring::CompletionScore},
 };
 
@@ -17,33 +18,13 @@ pub fn complete_policies<'a>(
 ) {
  let available_policies = &schema_cache.policies;
 
- let surrounded_by_quotes = ctx
- .get_node_under_cursor_content()
- .is_some_and(|c| c.starts_with('"') && c.ends_with('"') && c != "\"\"");
-
  for pol in available_policies {
- let completion_text = if surrounded_by_quotes {
+ let text = if node_text_surrounded_by_quotes(ctx) {
  // If we're within quotes, we want to change the content
  // *within* the quotes.
- // If we attempt to replace outside the quotes, the VSCode
- // client won't show the suggestions.
- let range = get_range_to_replace(ctx);
- Some(CompletionText {
- text: pol.name.clone(),
- is_snippet: false,
- range: TextRange::new(
- range.start() + TextSize::new(1),
- range.end() - TextSize::new(1),
- ),
- })
+ pol.name.to_string()
  } else {
- // If we aren't within quotes, we want to complete the
- // full policy including quotation marks.
- Some(CompletionText {
- is_snippet: false,
- text: format!("\"{}\"", pol.name),
- range: get_range_to_replace(ctx),
- })
+ format!("\"{}\"", pol.name)
  };
 
  let relevance = CompletionRelevanceData::Policy(pol);
@@ -54,7 +35,11 @@ pub fn complete_policies<'a>(
  filter: CompletionFilter::from(relevance),
  description: pol.table_name.to_string(),
  kind: CompletionItemKind::Policy,
- completion_text,
+ completion_text: Some(CompletionText {
+ text,
+ range: get_range_to_replace(ctx),
+ is_snippet: false,
+ }),
  detail: None,
  };
 

crates/pgt_completions/src/sanitization.rs

@@ -21,8 +21,8 @@ pub fn benchmark_sanitization(params: CompletionParams) -> String {
 }
 
 pub(crate) fn remove_sanitized_token(it: &str) -> String {
- it.replace(SANITIZED_TOKEN, "")
- .replace(SANITIZED_TOKEN_WITH_QUOTE, "")
+ it.replace(SANITIZED_TOKEN_WITH_QUOTE, "")
+ .replace(SANITIZED_TOKEN, "")
 }
 
 pub(crate) fn is_sanitized_token(node_under_cursor_txt: &str) -> bool {