still not there

Author: juleswritescode

crates/pgt_completions/src/providers/functions.rs

@@ -4,7 +4,7 @@ use pgt_treesitter::TreesitterContext;
 use crate::{
  CompletionItemKind, CompletionText,
  builder::{CompletionBuilder, PossibleCompletionItem},
- providers::helper::{get_range_to_replace, with_closed_quote},
+ providers::helper::get_range_to_replace,
  relevance::{CompletionRelevanceData, filtering::CompletionFilter, scoring::CompletionScore},
 };
 
@@ -35,8 +35,7 @@ pub fn complete_functions<'a>(
 }
 
 fn get_completion_text(ctx: &TreesitterContext, func: &Function) -> CompletionText {
- let closed_quote = with_closed_quote(ctx, &func.name);
- let mut text = with_schema_or_alias(ctx, closed_quote.as_str(), Some(func.schema.as_str()));
+ let mut text = with_schema_or_alias(ctx, func.name.as_str(), Some(func.schema.as_str()));
 
  let range = get_range_to_replace(ctx);
 

crates/pgt_completions/src/providers/helper.rs

@@ -17,15 +17,13 @@ pub(crate) fn get_range_to_replace(ctx: &TreesitterContext) -> TextRange {
  let sanitized = remove_sanitized_token(content);
  let length = sanitized.len();
 
- let start = node.start_byte();
- let end = start + length;
+ let mut start = node.start_byte();
+ let mut end = start + length;
 
- // let compl_text_in_quotes =
- // completion_text.starts_with('"') && completion_text.ends_with('"');
-
- // if compl_text_in_quotes && sanitized == r#""""# {
- // return TextRange::new(start.try_into().unwrap(), end.try_into().unwrap());
- // }
+ if node_text_surrounded_by_quotes(ctx) {
+ start -= 1;
+ end -= 1;
+ }
 
  TextRange::new(start.try_into().unwrap(), end.try_into().unwrap())
  }
@@ -39,33 +37,24 @@ pub(crate) fn with_schema_or_alias(
  schema_or_alias_name: Option<&str>,
 ) -> String {
  let is_already_prefixed_with_schema_name = ctx.schema_or_alias_name.is_some();
+
  let with_quotes = node_text_surrounded_by_quotes(ctx);
 
+ let node_under_cursor_txt = ctx.get_node_under_cursor_content().unwrap_or("".into());
+ let node_under_cursor_txt = node_under_cursor_txt.as_str();
+ let is_quote_sanitized = is_sanitized_token_with_quote(node_under_cursor_txt);
+
  if schema_or_alias_name.is_none_or(|s| s == "public") || is_already_prefixed_with_schema_name {
- if with_quotes {
- format!(r#""{}""#, item_name).to_string()
- } else {
- item_name.to_string()
- }
+ item_name.to_string()
  } else {
  let schema_or_als = schema_or_alias_name.unwrap();
 
- if with_quotes {
- format!(r#""{}"."{}""#, schema_or_als.replace('"', ""), item_name).to_string()
+ if is_quote_sanitized {
+ format!(r#"{}"."{}""#, schema_or_als.replace('"', ""), item_name).to_string()
+ } else if with_quotes {
+ format!(r#"{}"."{}"#, schema_or_als.replace('"', ""), item_name).to_string()
  } else {
  format!("{}.{}", schema_or_als, item_name).to_string()
  }
  }
 }
-
-pub(crate) fn with_closed_quote(ctx: &TreesitterContext, item_name: &str) -> String {
- let mut with_closed = String::from(item_name);
-
- if let Some(content) = ctx.get_node_under_cursor_content() {
- if is_sanitized_token_with_quote(content.as_str()) {
- with_closed.push('"');
- }
- }
-
- with_closed
-}

crates/pgt_completions/src/providers/tables.rs

@@ -5,7 +5,7 @@ use crate::{
  CompletionText,
  builder::{CompletionBuilder, PossibleCompletionItem},
  item::CompletionItemKind,
- providers::helper::{get_range_to_replace, with_closed_quote},
+ providers::helper::get_range_to_replace,
  relevance::{CompletionRelevanceData, filtering::CompletionFilter, scoring::CompletionScore},
 };
 
@@ -44,8 +44,7 @@ pub fn complete_tables<'a>(
 }
 
 fn get_completion_text(ctx: &TreesitterContext, table: &Table) -> CompletionText {
- let closed_quote = with_closed_quote(ctx, &table.name);
- let text = with_schema_or_alias(ctx, closed_quote.as_str(), Some(table.schema.as_str()));
+ let text = with_schema_or_alias(ctx, table.name.as_str(), Some(table.schema.as_str()));
 
  let range = get_range_to_replace(ctx);