ok

Author: juleswritescode

Cargo.toml

@@ -82,7 +82,7 @@ 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     = { path = "./crates/pgt_treesitter", 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" }
 

crates/pgt_completions/Cargo.toml

@@ -14,17 +14,17 @@ version              = "0.0.0"
 [dependencies]
 async-std = "1.12.0"
 
-pgt_text_size.workspace = true
-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 }
-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_treesitter/Cargo.toml

@@ -12,11 +12,11 @@ version              = "0.0.0"
 
 
 [dependencies]
-clap                      = { version = "4.5.23", features = ["derive"] }
-tree-sitter.workspace     = true
-tree_sitter_sql.workspace = true
-pgt_text_size.workspace = true
+clap                       = { version = "4.5.23", features = ["derive"] }
 pgt_schema_cache.workspace = true
+pgt_text_size.workspace    = true
+tree-sitter.workspace      = true
+tree_sitter_sql.workspace  = true
 
 [dev-dependencies]
 pgt_test_utils.workspace = true

crates/pgt_treesitter/src/context/mod.rs

@@ -212,11 +212,11 @@ impl<'a> CompletionContext<'a> {
         // policy handling is important to Supabase, but they are a PostgreSQL specific extension,
         // so the tree_sitter_sql language does not support it.
         // We infer the context manually.
-        if PolicyParser::looks_like_matching_stmt(&params.text) {
+        if PolicyParser::looks_like_matching_stmt(params.text) {
             ctx.gather_policy_context();
-        } else if GrantParser::looks_like_matching_stmt(&params.text) {
+        } else if GrantParser::looks_like_matching_stmt(params.text) {
             ctx.gather_grant_context();
-        } else if RevokeParser::looks_like_matching_stmt(&params.text) {
+        } else if RevokeParser::looks_like_matching_stmt(params.text) {
             ctx.gather_revoke_context();
         } else {
             ctx.gather_tree_context();
@@ -230,7 +230,7 @@ impl<'a> CompletionContext<'a> {
         let revoke_context = RevokeParser::get_context(self.text, self.position);
 
         self.node_under_cursor = Some(NodeUnderCursor::CustomNode {
-            text: revoke_context.node_text.into(),
+            text: revoke_context.node_text,
             range: revoke_context.node_range,
             kind: revoke_context.node_kind.clone(),
             previous_node_kind: None,
@@ -258,7 +258,7 @@ impl<'a> CompletionContext<'a> {
         let grant_context = GrantParser::get_context(self.text, self.position);
 
         self.node_under_cursor = Some(NodeUnderCursor::CustomNode {
-            text: grant_context.node_text.into(),
+            text: grant_context.node_text,
             range: grant_context.node_range,
             kind: grant_context.node_kind.clone(),
             previous_node_kind: None,
@@ -286,7 +286,7 @@ impl<'a> CompletionContext<'a> {
         let policy_context = PolicyParser::get_context(self.text, self.position);
 
         self.node_under_cursor = Some(NodeUnderCursor::CustomNode {
-            text: policy_context.node_text.into(),
+            text: policy_context.node_text,
             range: policy_context.node_range,
             kind: policy_context.node_kind.clone(),
             previous_node_kind: Some(policy_context.previous_node_kind),

crates/pgt_typecheck/Cargo.toml

@@ -12,16 +12,16 @@ version              = "0.0.0"
 
 
 [dependencies]
-pgt_console.workspace            = true
-pgt_diagnostics.workspace        = true
-pgt_query_ext.workspace          = true
-pgt_schema_cache.workspace       = true
-pgt_text_size.workspace          = true
-pgt_treesitter.workspace = true
-sqlx.workspace                   = true
-tokio.workspace                  = true
-tree-sitter.workspace            = true
-tree_sitter_sql.workspace        = true
+pgt_console.workspace      = true
+pgt_diagnostics.workspace  = true
+pgt_query_ext.workspace    = true
+pgt_schema_cache.workspace = true
+pgt_text_size.workspace    = true
+pgt_treesitter.workspace   = true
+sqlx.workspace             = true
+tokio.workspace            = true
+tree-sitter.workspace      = true
+tree_sitter_sql.workspace  = true
 
 [dev-dependencies]
 insta.workspace          = true

crates/pgt_workspace/src/features/completions.rs

@@ -129,7 +129,10 @@ mod tests {
 
     #[test]
     fn does_not_return_overlapping_statements_if_too_close() {
-        let sql = format!("select * from {}select 1;", QueryWithCursorPosition::cursor_marker());
+        let sql = format!(
+            "select * from {}select 1;",
+            QueryWithCursorPosition::cursor_marker()
+        );
 
         let (doc, position) = get_doc_and_pos(sql.as_str());
 
@@ -141,7 +144,10 @@ mod tests {
 
     #[test]
     fn is_fine_with_spaces() {
-        let sql = format!("select * from     {}     ;", QueryWithCursorPosition::cursor_marker());
+        let sql = format!(
+            "select * from     {}     ;",
+            QueryWithCursorPosition::cursor_marker()
+        );
 
         let (doc, position) = get_doc_and_pos(sql.as_str());
 
@@ -189,7 +195,10 @@ mod tests {
 
     #[test]
     fn does_not_consider_too_far_offset() {
-        let sql = format!("select * from  {}", QueryWithCursorPosition::cursor_marker());
+        let sql = format!(
+            "select * from  {}",
+            QueryWithCursorPosition::cursor_marker()
+        );
 
         let (doc, position) = get_doc_and_pos(sql.as_str());
 
@@ -198,7 +207,10 @@ mod tests {
 
     #[test]
     fn does_not_consider_offset_if_statement_terminated_by_semi() {
-        let sql = format!("select * from users;{}", QueryWithCursorPosition::cursor_marker());
+        let sql = format!(
+            "select * from users;{}",
+            QueryWithCursorPosition::cursor_marker()
+        );
 
         let (doc, position) = get_doc_and_pos(sql.as_str());