Add Racket tree-sitter support, remove Kotlin
- Add tree-sitter-racket dependency (v0.24) - Initialize Racket parser in code search - Add .rkt, .rktl, .rktd file extensions - Add test_racket_search test - Remove Kotlin from supported languages (was disabled) - Clean up duplicate test files Supported languages: Rust, Python, JavaScript, TypeScript, Go, Java, C, C++, Racket
This commit is contained in:
11
Cargo.lock
generated
11
Cargo.lock
generated
@@ -1453,6 +1453,7 @@ dependencies = [
|
|||||||
"tree-sitter-java",
|
"tree-sitter-java",
|
||||||
"tree-sitter-javascript",
|
"tree-sitter-javascript",
|
||||||
"tree-sitter-python",
|
"tree-sitter-python",
|
||||||
|
"tree-sitter-racket",
|
||||||
"tree-sitter-rust",
|
"tree-sitter-rust",
|
||||||
"tree-sitter-scheme",
|
"tree-sitter-scheme",
|
||||||
"tree-sitter-typescript",
|
"tree-sitter-typescript",
|
||||||
@@ -3946,6 +3947,16 @@ dependencies = [
|
|||||||
"tree-sitter-language",
|
"tree-sitter-language",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "tree-sitter-racket"
|
||||||
|
version = "0.24.7"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "f8395b6a054e6264c67e1ef915f239c4f86575b7d7c69638bdbf3c336c58f128"
|
||||||
|
dependencies = [
|
||||||
|
"cc",
|
||||||
|
"tree-sitter-language",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tree-sitter-rust"
|
name = "tree-sitter-rust"
|
||||||
version = "0.23.3"
|
version = "0.23.3"
|
||||||
|
|||||||
@@ -40,6 +40,7 @@ tree-sitter-cpp = "0.23"
|
|||||||
# tree-sitter-kotlin = "0.3" # Temporarily disabled - incompatible with tree-sitter 0.24
|
# tree-sitter-kotlin = "0.3" # Temporarily disabled - incompatible with tree-sitter 0.24
|
||||||
tree-sitter-haskell = { git = "https://github.com/tree-sitter/tree-sitter-haskell" }
|
tree-sitter-haskell = { git = "https://github.com/tree-sitter/tree-sitter-haskell" }
|
||||||
tree-sitter-scheme = "0.24"
|
tree-sitter-scheme = "0.24"
|
||||||
|
tree-sitter-racket = "0.24"
|
||||||
streaming-iterator = "0.1"
|
streaming-iterator = "0.1"
|
||||||
walkdir = "2.4"
|
walkdir = "2.4"
|
||||||
|
|
||||||
|
|||||||
@@ -1,24 +0,0 @@
|
|||||||
package com.example
|
|
||||||
|
|
||||||
class Person(val name: String, val age: Int) {
|
|
||||||
fun greet() {
|
|
||||||
println("Hello, I'm $name")
|
|
||||||
}
|
|
||||||
|
|
||||||
fun getAge(): Int {
|
|
||||||
return age
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
interface Greeter {
|
|
||||||
fun sayHello()
|
|
||||||
}
|
|
||||||
|
|
||||||
fun main() {
|
|
||||||
val person = Person("Alice", 30)
|
|
||||||
person.greet()
|
|
||||||
}
|
|
||||||
|
|
||||||
fun add(a: Int, b: Int): Int {
|
|
||||||
return a + b
|
|
||||||
}
|
|
||||||
@@ -121,17 +121,6 @@ impl TreeSitterSearcher {
|
|||||||
languages.insert("cpp".to_string(), language);
|
languages.insert("cpp".to_string(), language);
|
||||||
}
|
}
|
||||||
|
|
||||||
// // Initialize Kotlin - Temporarily disabled due to tree-sitter version incompatibility
|
|
||||||
// {
|
|
||||||
// let mut parser = Parser::new();
|
|
||||||
// let language: Language = tree_sitter_kotlin::language();
|
|
||||||
// parser
|
|
||||||
// .set_language(&language)
|
|
||||||
// .map_err(|e| anyhow!("Failed to set Kotlin language: {}", e))?;
|
|
||||||
// parsers.insert("kotlin".to_string(), parser);
|
|
||||||
// languages.insert("kotlin".to_string(), language);
|
|
||||||
// }
|
|
||||||
|
|
||||||
// Initialize Haskell
|
// Initialize Haskell
|
||||||
{
|
{
|
||||||
let mut parser = Parser::new();
|
let mut parser = Parser::new();
|
||||||
@@ -154,6 +143,17 @@ impl TreeSitterSearcher {
|
|||||||
languages.insert("scheme".to_string(), language);
|
languages.insert("scheme".to_string(), language);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Initialize Racket
|
||||||
|
{
|
||||||
|
let mut parser = Parser::new();
|
||||||
|
let language: Language = tree_sitter_racket::LANGUAGE.into();
|
||||||
|
parser
|
||||||
|
.set_language(&language)
|
||||||
|
.map_err(|e| anyhow!("Failed to set Racket language: {}", e))?;
|
||||||
|
parsers.insert("racket".to_string(), parser);
|
||||||
|
languages.insert("racket".to_string(), language);
|
||||||
|
}
|
||||||
|
|
||||||
if parsers.is_empty() {
|
if parsers.is_empty() {
|
||||||
return Err(anyhow!(
|
return Err(anyhow!(
|
||||||
"No language parsers available. Enable at least one language feature."
|
"No language parsers available. Enable at least one language feature."
|
||||||
@@ -335,9 +335,10 @@ impl TreeSitterSearcher {
|
|||||||
("java", Some("java")) => true,
|
("java", Some("java")) => true,
|
||||||
("c", Some("c" | "h")) => true,
|
("c", Some("c" | "h")) => true,
|
||||||
("cpp", Some("cpp" | "cc" | "cxx" | "hpp" | "hxx" | "h")) => true,
|
("cpp", Some("cpp" | "cc" | "cxx" | "hpp" | "hxx" | "h")) => true,
|
||||||
("kotlin", Some("kt" | "kts")) => true,
|
|
||||||
("haskell", Some("hs" | "lhs")) => true,
|
("haskell", Some("hs" | "lhs")) => true,
|
||||||
("scheme", Some("scm" | "ss" | "sld" | "sls")) => true,
|
("scheme", Some("scm" | "ss" | "sld" | "sls")) => true,
|
||||||
|
("racket", Some("rkt" | "rktl" | "rktd")) => true,
|
||||||
_ => false,
|
_ => false,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -227,7 +227,7 @@ fn create_core_tools(exclude_research: bool) -> Vec<Tool> {
|
|||||||
},
|
},
|
||||||
Tool {
|
Tool {
|
||||||
name: "code_search".to_string(),
|
name: "code_search".to_string(),
|
||||||
description: "Syntax-aware code search that understands code structure, not just text. Finds actual functions, classes, methods, and other code constructs - ignores matches in comments and strings. Much more accurate than grep for code searches. Supports batch searches (up to 20 parallel) with structured results and context lines. Languages: Rust, Python, JavaScript, TypeScript, Go, Java, C, C++, Kotlin. Uses tree-sitter query syntax.".to_string(),
|
description: "Syntax-aware code search that understands code structure, not just text. Finds actual functions, classes, methods, and other code constructs - ignores matches in comments and strings. Much more accurate than grep for code searches. Supports batch searches (up to 20 parallel) with structured results and context lines. Languages: Rust, Python, JavaScript, TypeScript, Go, Java, C, C++, Racket. Uses tree-sitter query syntax.".to_string(),
|
||||||
input_schema: json!({
|
input_schema: json!({
|
||||||
"type": "object",
|
"type": "object",
|
||||||
"properties": {
|
"properties": {
|
||||||
@@ -239,7 +239,7 @@ fn create_core_tools(exclude_research: bool) -> Vec<Tool> {
|
|||||||
"properties": {
|
"properties": {
|
||||||
"name": { "type": "string", "description": "Label for this search." },
|
"name": { "type": "string", "description": "Label for this search." },
|
||||||
"query": { "type": "string", "description": "tree-sitter query in S-expression format (e.g., \"(function_item name: (identifier) @name)\")" },
|
"query": { "type": "string", "description": "tree-sitter query in S-expression format (e.g., \"(function_item name: (identifier) @name)\")" },
|
||||||
"language": { "type": "string", "enum": ["rust", "python", "javascript", "typescript", "go", "java", "c", "cpp", "kotlin"], "description": "Programming language to search." },
|
"language": { "type": "string", "enum": ["rust", "python", "javascript", "typescript", "go", "java", "c", "cpp", "racket"], "description": "Programming language to search." },
|
||||||
"paths": { "type": "array", "items": { "type": "string" }, "description": "Paths/dirs to search. Defaults to current dir if empty." },
|
"paths": { "type": "array", "items": { "type": "string" }, "description": "Paths/dirs to search. Defaults to current dir if empty." },
|
||||||
"context_lines": { "type": "integer", "minimum": 0, "maximum": 20, "default": 0, "description": "Lines of context to include around each match." }
|
"context_lines": { "type": "integer", "minimum": 0, "maximum": 20, "default": 0, "description": "Lines of context to include around each match." }
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -580,14 +580,21 @@ async fn test_cpp_search() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[tokio::test]
|
#[tokio::test]
|
||||||
#[ignore]
|
async fn test_racket_search() {
|
||||||
async fn test_kotlin_search() {
|
// Get the workspace root (where Cargo.toml is)
|
||||||
|
let manifest_dir = std::env::var("CARGO_MANIFEST_DIR").unwrap();
|
||||||
|
let workspace_root = std::path::Path::new(&manifest_dir)
|
||||||
|
.parent()
|
||||||
|
.and_then(|p| p.parent())
|
||||||
|
.unwrap();
|
||||||
|
let test_code_path = workspace_root.join("examples/test_code");
|
||||||
|
|
||||||
let request = CodeSearchRequest {
|
let request = CodeSearchRequest {
|
||||||
searches: vec![SearchSpec {
|
searches: vec![SearchSpec {
|
||||||
name: "kotlin_classes".to_string(),
|
name: "racket_functions".to_string(),
|
||||||
query: "(class_declaration (type_identifier) @name)".to_string(),
|
query: r#"(list . (symbol) @kw (#eq? @kw "define") . (list . (symbol) @name))"#.to_string(),
|
||||||
language: "kotlin".to_string(),
|
language: "racket".to_string(),
|
||||||
paths: vec!["examples/test_code".to_string()],
|
paths: vec![test_code_path.to_string_lossy().to_string()],
|
||||||
context_lines: 0,
|
context_lines: 0,
|
||||||
}],
|
}],
|
||||||
max_concurrency: 4,
|
max_concurrency: 4,
|
||||||
@@ -598,11 +605,11 @@ async fn test_kotlin_search() {
|
|||||||
assert_eq!(response.searches.len(), 1);
|
assert_eq!(response.searches.len(), 1);
|
||||||
assert!(response.searches[0].matches.len() > 0);
|
assert!(response.searches[0].matches.len() > 0);
|
||||||
|
|
||||||
// Should find Person class
|
// Should find greet, add, factorial functions
|
||||||
let names: Vec<&str> = response.searches[0]
|
let names: Vec<&str> = response.searches[0]
|
||||||
.matches
|
.matches
|
||||||
.iter()
|
.iter()
|
||||||
.filter_map(|m| m.captures.get("name").map(|s| s.as_str()))
|
.filter_map(|m| m.captures.get("name").map(|s| s.as_str()))
|
||||||
.collect();
|
.collect();
|
||||||
assert!(names.contains(&"Person"));
|
assert!(names.contains(&"greet"));
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user