progress

Author: psteinroe

Cargo.lock

@@ -48,7 +48,7 @@ prost                    = "0.13.5"
 prost-reflect            = "0.15.3"
 protox                   = "0.8.0"
 sqlx                     = { version = "0.8.2", features = ["runtime-tokio", "runtime-async-std", "postgres", "json"] }
-syn                      = "1.0.109"
+syn                      = { version = "1.0.109", features = ["full"] }
 termcolor                = "1.4.1"
 test-log                 = "0.2.17"
 thiserror                = "1.0.31"
@@ -85,9 +85,10 @@ pgt_suppressions           = { path = "./crates/pgt_suppressions", version = "0.
 pgt_text_edit              = { path = "./crates/pgt_text_edit", version = "0.0.0" }
 pgt_text_size              = { path = "./crates/pgt_text_size", version = "0.0.0" }
 pgt_tokenizer              = { path = "./crates/pgt_tokenizer", version = "0.0.0" }
-pgt_treesitter_queries     = { path = "./crates/pgt_treesitter_queries", version = "0.0.0" }
+pgt_treesitter             = { path = "./crates/pgt_treesitter", version = "0.0.0" }
 pgt_typecheck              = { path = "./crates/pgt_typecheck", version = "0.0.0" }
 pgt_workspace              = { path = "./crates/pgt_workspace", version = "0.0.0" }
+pgt_workspace_macros       = { path = "./crates/pgt_workspace_macros", version = "0.0.0" }
 
 pgt_test_macros = { path = "./crates/pgt_test_macros" }
 pgt_test_utils  = { path = "./crates/pgt_test_utils" }

Cargo.toml

@@ -14,18 +14,17 @@ version              = "0.0.0"
 [dependencies]
 async-std = "1.12.0"
 
-pgt_text_size.workspace = true
-
-
-fuzzy-matcher                    = "0.3.7"
-pgt_schema_cache.workspace       = true
-pgt_treesitter_queries.workspace = true
-schemars                         = { workspace = true, optional = true }
-serde                            = { workspace = true, features = ["derive"] }
-serde_json                       = { workspace = true }
-tracing                          = { workspace = true }
-tree-sitter.workspace            = true
-tree_sitter_sql.workspace        = true
+pgt_schema_cache.workspace = true
+pgt_text_size.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 }
+tracing                   = { workspace = true }
+tree-sitter.workspace     = true
+tree_sitter_sql.workspace = true
 
 sqlx.workspace = true
 

crates/pgt_completions/Cargo.toml

@@ -1,10 +1,11 @@
 use crate::{
     CompletionItemKind, CompletionText,
-    context::CompletionContext,
     item::CompletionItem,
     relevance::{filtering::CompletionFilter, scoring::CompletionScore},
 };
 
+use pgt_treesitter::TreesitterContext;
+
 pub(crate) struct PossibleCompletionItem<'a> {
     pub label: String,
     pub description: String,
@@ -17,11 +18,11 @@ pub(crate) struct PossibleCompletionItem<'a> {
 
 pub(crate) struct CompletionBuilder<'a> {
     items: Vec<PossibleCompletionItem<'a>>,
-    ctx: &'a CompletionContext<'a>,
+    ctx: &'a TreesitterContext<'a>,
 }
 
 impl<'a> CompletionBuilder<'a> {
-    pub fn new(ctx: &'a CompletionContext) -> Self {
+    pub fn new(ctx: &'a TreesitterContext) -> Self {
         CompletionBuilder { items: vec![], ctx }
     }
 

crates/pgt_completions/src/builder.rs

@@ -1,8 +1,9 @@
 use pgt_text_size::TextSize;
 
+use pgt_treesitter::{TreeSitterContextParams, context::TreesitterContext};
+
 use crate::{
     builder::CompletionBuilder,
-    context::CompletionContext,
     item::CompletionItem,
     providers::{
         complete_columns, complete_functions, complete_policies, complete_roles, complete_schemas,
@@ -28,16 +29,20 @@ 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 = TreesitterContext::new(TreeSitterContextParams {
+        position: sanitized_params.position,
+        text: &sanitized_params.text,
+        tree: &sanitized_params.tree,
+    });
 
     let mut builder = CompletionBuilder::new(&ctx);
 
-    complete_tables(&ctx, &mut builder);
-    complete_functions(&ctx, &mut builder);
-    complete_columns(&ctx, &mut builder);
-    complete_schemas(&ctx, &mut builder);
-    complete_policies(&ctx, &mut builder);
-    complete_roles(&ctx, &mut builder);
+    complete_tables(&ctx, sanitized_params.schema, &mut builder);
+    complete_functions(&ctx, sanitized_params.schema, &mut builder);
+    complete_columns(&ctx, sanitized_params.schema, &mut builder);
+    complete_schemas(&ctx, sanitized_params.schema, &mut builder);
+    complete_policies(&ctx, sanitized_params.schema, &mut builder);
+    complete_roles(&ctx, sanitized_params.schema, &mut builder);
 
     builder.finish()
 }

crates/pgt_completions/src/complete.rs

@@ -1,6 +1,5 @@
 mod builder;
 mod complete;
-mod context;
 mod item;
 mod providers;
 mod relevance;