chore: replace tree-sitter submodule with internal crate (#527)

Author: juleswritescode

.claude/settings.local.json

@@ -12,4 +12,4 @@
     ],
     "deny": []
   }
-}
+}

.cursorignore

@@ -1,7 +1,3 @@
-[submodule "crates/tree_sitter_sql/tree-sitter-sql"]
-	path = lib/tree_sitter_sql/tree-sitter-sql
-	url = https://github.com/DerekStride/tree-sitter-sql
-	branch = gh-pages
 [submodule "crates/pgt_query/vendor/libpg_query"]
 	path = crates/pgt_query/vendor/libpg_query
 	url = https://github.com/pganalyze/libpg_query.git

.gitmodules

@@ -1,5 +1,5 @@
 [workspace]
-members  = ["crates/*", "lib/*", "xtask/codegen", "xtask/rules_check", "docs/codegen"]
+members  = ["crates/*", "xtask/codegen", "xtask/rules_check", "docs/codegen"]
 resolver = "2"
 
 [workspace.package]
@@ -56,8 +56,7 @@ tokio                    = { version = "1.40.0", features = ["full"] }
 tracing                  = { version = "0.1.40", default-features = false, features = ["std"] }
 tracing-bunyan-formatter = { version = "0.3.10 " }
 tracing-subscriber       = "0.3.18"
-tree-sitter              = "0.20.10"
-tree_sitter_sql          = { path = "./lib/tree_sitter_sql", version = "0.0.0" }
+tree-sitter              = "0.25.9"
 unicode-width            = "0.1.12"
 
 # postgres specific crates
@@ -88,6 +87,7 @@ 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_grammar     = { path = "./crates/pgt_treesitter_grammar", 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" }

Cargo.lock

@@ -18,13 +18,13 @@ 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
+fuzzy-matcher                    = "0.3.7"
+pgt_treesitter_grammar.workspace = true
+schemars                         = { workspace = true, optional = true }
+serde                            = { workspace = true, features = ["derive"] }
+serde_json                       = { workspace = true }
+tracing                          = { workspace = true }
+tree-sitter.workspace            = true
 
 sqlx.workspace = true
 

Cargo.toml

@@ -12,7 +12,9 @@ fn sql_and_pos(sql: &str) -> (String, usize) {
 
 fn get_tree(sql: &str) -> tree_sitter::Tree {
     let mut parser = tree_sitter::Parser::new();
-    parser.set_language(tree_sitter_sql::language()).unwrap();
+    parser
+        .set_language(&pgt_treesitter_grammar::LANGUAGE.into())
+        .unwrap();
     parser.parse(sql, None).unwrap()
 }
 

crates/pgt_completions/Cargo.toml

@@ -112,7 +112,7 @@ where
 
         let mut parser = tree_sitter::Parser::new();
         parser
-            .set_language(tree_sitter_sql::language())
+            .set_language(&pgt_treesitter_grammar::LANGUAGE.into())
             .expect("Error loading sql language");
         let tree = parser.parse(sql.clone(), None).unwrap();
 
@@ -314,7 +314,8 @@ mod tests {
 
     fn get_test_params(input: &str, position: TextSize) -> CompletionParams {
         let mut ts = tree_sitter::Parser::new();
-        ts.set_language(tree_sitter_sql::language()).unwrap();
+        ts.set_language(&pgt_treesitter_grammar::LANGUAGE.into())
+            .unwrap();
 
         let tree = Box::new(ts.parse(input, None).unwrap());
         let cache = Box::new(SchemaCache::default());
@@ -495,7 +496,7 @@ mod tests {
 
         let mut parser = tree_sitter::Parser::new();
         parser
-            .set_language(tree_sitter_sql::language())
+            .set_language(&pgt_treesitter_grammar::LANGUAGE.into())
             .expect("Error loading sql language");
 
         let tree = parser.parse(input, None).unwrap();

crates/pgt_completions/benches/sanitization.rs

@@ -23,7 +23,7 @@ pub(crate) async fn get_test_deps(
 
     let mut parser = tree_sitter::Parser::new();
     parser
-        .set_language(tree_sitter_sql::language())
+        .set_language(&pgt_treesitter_grammar::LANGUAGE.into())
         .expect("Error loading sql language");
 
     let tree = parser.parse(input.to_string(), None).unwrap();
@@ -48,7 +48,7 @@ pub(crate) async fn test_against_connection_string(
 
     let mut parser = tree_sitter::Parser::new();
     parser
-        .set_language(tree_sitter_sql::language())
+        .set_language(&pgt_treesitter_grammar::LANGUAGE.into())
         .expect("Error loading sql language");
 
     let tree = parser.parse(input.to_string(), None).unwrap();

crates/pgt_completions/src/sanitization.rs

@@ -12,19 +12,19 @@ version              = "0.0.0"
 
 
 [dependencies]
-humansize                  = { version = "2.1.3" }
-pgt_query.workspace        = true
-pgt_schema_cache.workspace = true
-pgt_text_size.workspace    = true
-pgt_treesitter.workspace   = true
-schemars                   = { workspace = true, optional = true }
-serde                      = { workspace = true, features = ["derive"] }
-serde_json                 = { workspace = true }
-sqlx.workspace             = true
-tokio                      = { version = "1.41.1", features = ["full"] }
-tracing                    = { workspace = true }
-tree-sitter.workspace      = true
-tree_sitter_sql.workspace  = true
+humansize                        = { version = "2.1.3" }
+pgt_query.workspace              = true
+pgt_schema_cache.workspace       = true
+pgt_text_size.workspace          = true
+pgt_treesitter.workspace         = true
+pgt_treesitter_grammar.workspace = true
+schemars                         = { workspace = true, optional = true }
+serde                            = { workspace = true, features = ["derive"] }
+serde_json                       = { workspace = true }
+sqlx.workspace                   = true
+tokio                            = { version = "1.41.1", features = ["full"] }
+tracing                          = { workspace = true }
+tree-sitter.workspace            = true
 
 [dev-dependencies]
 insta                    = { version = "1.42.1" }