wowa wiwa

juleswritescode · juleswritescode · commit bfc24048060a · 2025-07-19T16:16:45.000+02:00
diff --git a/crates/pgt_completions/Cargo.toml b/crates/pgt_completions/Cargo.toml
@@ -15,11 +15,10 @@ version              = "0.0.0"
 async-std = "1.12.0"
 
 pgt_text_size.workspace = true
-
-
-fuzzy-matcher                    = "0.3.7"
 pgt_schema_cache.workspace       = true
 pgt_treesitter.workspace = true
+
+fuzzy-matcher                    = "0.3.7"
 schemars                         = { workspace = true, optional = true }
 serde                            = { workspace = true, features = ["derive"] }
 serde_json                       = { workspace = true }
diff --git a/crates/pgt_completions/src/builder.rs b/crates/pgt_completions/src/builder.rs
@@ -1,10 +1,11 @@
 use crate::{
     CompletionItemKind, CompletionText,
-    context::CompletionContext,
     item::CompletionItem,
     relevance::{filtering::CompletionFilter, scoring::CompletionScore},
 };
 
+use pgt_treesitter::CompletionContext;
+
 pub(crate) struct PossibleCompletionItem<'a> {
     pub label: String,
     pub description: String,
diff --git a/crates/pgt_completions/src/complete.rs b/crates/pgt_completions/src/complete.rs
@@ -1,8 +1,9 @@
 use pgt_text_size::TextSize;
 
+use pgt_treesitter::{TreeSitterContextParams, context::CompletionContext};
+
 use crate::{
     builder::CompletionBuilder,
-    context::CompletionContext,
     item::CompletionItem,
     providers::{
         complete_columns, complete_functions, complete_policies, complete_roles, complete_schemas,
@@ -28,7 +29,12 @@ pub struct CompletionParams<'a> {
 pub fn complete(params: CompletionParams) -> Vec<CompletionItem> {
     let sanitized_params = SanitizedCompletionParams::from(params);
 
-    let ctx = CompletionContext::new(&sanitized_params);
+    let ctx = CompletionContext::new(TreeSitterContextParams {
+        position: sanitized_params.position,
+        schema: sanitized_params.schema,
+        text: &sanitized_params.text,
+        tree: &sanitized_params.tree,
+    });
 
     let mut builder = CompletionBuilder::new(&ctx);
 
diff --git a/crates/pgt_completions/src/providers/columns.rs b/crates/pgt_completions/src/providers/columns.rs
@@ -1,7 +1,8 @@
+use pgt_treesitter::{CompletionContext, WrappingClause};
+
 use crate::{
     CompletionItemKind,
     builder::{CompletionBuilder, PossibleCompletionItem},
-    context::{CompletionContext, WrappingClause},
     relevance::{CompletionRelevanceData, filtering::CompletionFilter, scoring::CompletionScore},
 };
 
diff --git a/crates/pgt_completions/src/providers/functions.rs b/crates/pgt_completions/src/providers/functions.rs
@@ -1,9 +1,9 @@
 use pgt_schema_cache::Function;
+use pgt_treesitter::CompletionContext;
 
 use crate::{
     CompletionItemKind, CompletionText,
     builder::{CompletionBuilder, PossibleCompletionItem},
-    context::CompletionContext,
     providers::helper::get_range_to_replace,
     relevance::{CompletionRelevanceData, filtering::CompletionFilter, scoring::CompletionScore},
 };
@@ -123,7 +123,10 @@ mod tests {
           $$;
         "#;
 
-        let query = format!(r#"select * from coo{}()"#, QueryWithCursorPosition::cursor_marker());
+        let query = format!(
+            r#"select * from coo{}()"#,
+            QueryWithCursorPosition::cursor_marker()
+        );
 
         let (tree, cache) = get_test_deps(Some(setup), query.as_str().into(), &pool).await;
         let params = get_test_params(&tree, &cache, query.as_str().into());
@@ -191,7 +194,10 @@ mod tests {
           $$;
         "#;
 
-        let query = format!(r#"select * from coo{}()"#, QueryWithCursorPosition::cursor_marker());
+        let query = format!(
+            r#"select * from coo{}()"#,
+            QueryWithCursorPosition::cursor_marker()
+        );
 
         let (tree, cache) = get_test_deps(Some(setup), query.as_str().into(), &pool).await;
         let params = get_test_params(&tree, &cache, query.as_str().into());
diff --git a/crates/pgt_completions/src/providers/helper.rs b/crates/pgt_completions/src/providers/helper.rs
@@ -1,6 +1,7 @@
 use pgt_text_size::{TextRange, TextSize};
+use pgt_treesitter::CompletionContext;
 
-use crate::{CompletionText, context::CompletionContext, remove_sanitized_token};
+use crate::{CompletionText, remove_sanitized_token};
 
 pub(crate) fn find_matching_alias_for_table(
     ctx: &CompletionContext,
diff --git a/crates/pgt_completions/src/providers/policies.rs b/crates/pgt_completions/src/providers/policies.rs
@@ -1,9 +1,9 @@
 use pgt_text_size::{TextRange, TextSize};
+use pgt_treesitter::CompletionContext;
 
 use crate::{
     CompletionItemKind, CompletionText,
     builder::{CompletionBuilder, PossibleCompletionItem},
-    context::CompletionContext,
     relevance::{CompletionRelevanceData, filtering::CompletionFilter, scoring::CompletionScore},
 };
 
@@ -90,7 +90,11 @@ mod tests {
         pool.execute(setup).await.unwrap();
 
         assert_complete_results(
-            format!("alter policy \"{}\" on private.users;", QueryWithCursorPosition::cursor_marker()).as_str(),
+            format!(
+                "alter policy \"{}\" on private.users;",
+                QueryWithCursorPosition::cursor_marker()
+            )
+            .as_str(),
             vec![
                 CompletionAssertion::Label("read for public users disallowed".into()),
                 CompletionAssertion::Label("write for public users allowed".into()),
@@ -101,7 +105,11 @@ mod tests {
         .await;
 
         assert_complete_results(
-            format!("alter policy \"w{}\" on private.users;", QueryWithCursorPosition::cursor_marker()).as_str(),
+            format!(
+                "alter policy \"w{}\" on private.users;",
+                QueryWithCursorPosition::cursor_marker()
+            )
+            .as_str(),
             vec![CompletionAssertion::Label(
                 "write for public users allowed".into(),
             )],
diff --git a/crates/pgt_completions/src/providers/roles.rs b/crates/pgt_completions/src/providers/roles.rs
@@ -1,9 +1,9 @@
 use crate::{
     CompletionItemKind,
     builder::{CompletionBuilder, PossibleCompletionItem},
-    context::CompletionContext,
     relevance::{CompletionRelevanceData, filtering::CompletionFilter, scoring::CompletionScore},
 };
+use pgt_treesitter::CompletionContext;
 
 pub fn complete_roles<'a>(ctx: &CompletionContext<'a>, builder: &mut CompletionBuilder<'a>) {
     let available_roles = &ctx.schema_cache.roles;
diff --git a/crates/pgt_completions/src/providers/schemas.rs b/crates/pgt_completions/src/providers/schemas.rs
@@ -1,8 +1,8 @@
 use crate::{
     builder::{CompletionBuilder, PossibleCompletionItem},
-    context::CompletionContext,
     relevance::{CompletionRelevanceData, filtering::CompletionFilter, scoring::CompletionScore},
 };
+use pgt_treesitter::CompletionContext;
 
 pub fn complete_schemas<'a>(ctx: &'a CompletionContext, builder: &mut CompletionBuilder<'a>) {
     let available_schemas = &ctx.schema_cache.schemas;
@@ -99,7 +99,11 @@ mod tests {
         "#;
 
         assert_complete_results(
-            format!("select * from u{}", QueryWithCursorPosition::cursor_marker()).as_str(),
+            format!(
+                "select * from u{}",
+                QueryWithCursorPosition::cursor_marker()
+            )
+            .as_str(),
             vec![
                 CompletionAssertion::LabelAndKind("users".into(), CompletionItemKind::Table),
                 CompletionAssertion::LabelAndKind("ultimate".into(), CompletionItemKind::Schema),
diff --git a/crates/pgt_completions/src/providers/tables.rs b/crates/pgt_completions/src/providers/tables.rs
@@ -1,6 +1,7 @@
+use pgt_treesitter::CompletionContext;
+
 use crate::{
     builder::{CompletionBuilder, PossibleCompletionItem},
-    context::CompletionContext,
     item::CompletionItemKind,
     relevance::{CompletionRelevanceData, filtering::CompletionFilter, scoring::CompletionScore},
 };
diff --git a/crates/pgt_completions/src/relevance/filtering.rs b/crates/pgt_completions/src/relevance/filtering.rs
@@ -1,6 +1,6 @@
 use pgt_schema_cache::ProcKind;
 
-use crate::context::{CompletionContext, NodeUnderCursor, WrappingClause, WrappingNode};
+use pgt_treesitter::context::{CompletionContext, NodeUnderCursor, WrappingClause, WrappingNode};
 
 use super::CompletionRelevanceData;
 
diff --git a/crates/pgt_completions/src/relevance/scoring.rs b/crates/pgt_completions/src/relevance/scoring.rs
@@ -1,6 +1,8 @@
 use fuzzy_matcher::{FuzzyMatcher, skim::SkimMatcherV2};
 
-use crate::context::{CompletionContext, WrappingClause, WrappingNode};
+use pgt_treesitter::context::{CompletionContext, WrappingClause, WrappingNode};
+
+use crate::sanitization;
 
 use super::CompletionRelevanceData;
 
@@ -37,8 +39,8 @@ impl CompletionScore<'_> {
 
     fn check_matches_query_input(&mut self, ctx: &CompletionContext) {
         let content = match ctx.get_node_under_cursor_content() {
-            Some(c) => c.replace('"', ""),
-            None => return,
+            Some(c) if !sanitization::is_sanitized_token(c.as_str()) => c.replace('"', ""),
+            _ => return,
         };
 
         let name = match self.data {
@@ -142,7 +144,9 @@ impl CompletionScore<'_> {
         };
 
         let has_mentioned_schema = ctx.schema_or_alias_name.is_some();
-        let has_node_text = ctx.get_node_under_cursor_content().is_some();
+        let has_node_text = ctx
+            .get_node_under_cursor_content()
+            .is_some_and(|txt| !sanitization::is_sanitized_token(txt.as_str()));
 
         self.score += match self.data {
             CompletionRelevanceData::Table(_) => match wrapping_node {
diff --git a/crates/pgt_completions/src/sanitization.rs b/crates/pgt_completions/src/sanitization.rs
@@ -23,6 +23,10 @@ pub(crate) fn remove_sanitized_token(it: &str) -> String {
     it.replace(SANITIZED_TOKEN, "")
 }
 
+pub(crate) fn is_sanitized_token(txt: &str) -> bool {
+    txt == SANITIZED_TOKEN
+}
+
 #[derive(PartialEq, Eq, Debug)]
 pub(crate) enum NodeText {
     Replaced,
@@ -118,10 +122,6 @@ where
             tree: Cow::Borrowed(params.tree),
         }
     }
-
-    pub fn is_sanitized_token(txt: &str) -> bool {
-        txt == SANITIZED_TOKEN
-    }
 }
 
 /// Checks if the cursor is positioned inbetween two SQL nodes.
diff --git a/crates/pgt_completions/src/test_helper.rs b/crates/pgt_completions/src/test_helper.rs
@@ -1,5 +1,3 @@
-use std::fmt::Display;
-
 use pgt_schema_cache::SchemaCache;
 use pgt_test_utils::QueryWithCursorPosition;
 use sqlx::{Executor, PgPool};
@@ -62,7 +60,7 @@ pub(crate) fn get_test_params<'a>(
     schema_cache: &'a pgt_schema_cache::SchemaCache,
     sql: QueryWithCursorPosition,
 ) -> CompletionParams<'a> {
-    let (position, text) = get_text_and_position(sql);
+    let (position, text) = sql.get_text_and_position();
 
     CompletionParams {
         position: (position as u32).into(),
diff --git a/crates/pgt_treesitter/src/context/mod.rs b/crates/pgt_treesitter/src/context/mod.rs
diff --git a/crates/pgt_treesitter/src/lib.rs b/crates/pgt_treesitter/src/lib.rs
