alex/g3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes for scheme+haskell

Browse Source
This commit is contained in:
Dhanji R. Prasanna
2025-11-05 14:33:12 +11:00
parent 4327c839a9
commit 53c8245942
3 changed files with 126 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
crates/g3-core/Cargo.toml
View File

@@ -28,14 +28,17 @@ shellexpand = "3.1"
serde_yaml = "0.9"
# tree-sitter for embedded code search
tree-sitter = "0.22"
tree-sitter-rust = "0.21"
tree-sitter-python = "0.21"
tree-sitter-javascript = "0.21"
tree-sitter-typescript = "0.21"
tree-sitter-go = "0.21"
tree-sitter-java = "0.21"
tree-sitter-c = "0.21"
tree-sitter-cpp = "0.21"
tree-sitter-kotlin = "0.3"
tree-sitter = "0.24"
tree-sitter-rust = "0.23"
tree-sitter-python = "0.23"
tree-sitter-javascript = "0.23"
tree-sitter-typescript = "0.23"
tree-sitter-go = "0.23"
tree-sitter-java = "0.23"
tree-sitter-c = "0.23"
tree-sitter-cpp = "0.23"
# 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-scheme = "0.24"
streaming-iterator = "0.1"
walkdir = "2.4"

58
crates/g3-core/src/code_search/searcher.rs
View File

@@ -4,6 +4,7 @@ use std::collections::HashMap;
use std::fs;
use std::path::Path;
use tree_sitter::{Language, Parser, Query, QueryCursor};
use streaming_iterator::StreamingIterator;
use walkdir::WalkDir;
pub struct TreeSitterSearcher {
@@ -19,7 +20,7 @@ impl TreeSitterSearcher {
// Initialize Rust
{
let mut parser = Parser::new();
let language: Language = tree_sitter_rust::language().into();
let language: Language = tree_sitter_rust::LANGUAGE.into();
parser
.set_language(&language)
.map_err(|e| anyhow!("Failed to set Rust language: {}", e))?;
@@ -30,7 +31,7 @@ impl TreeSitterSearcher {
// Initialize Python
{
let mut parser = Parser::new();
let language: Language = tree_sitter_python::language().into();
let language: Language = tree_sitter_python::LANGUAGE.into();
parser
.set_language(&language)
.map_err(|e| anyhow!("Failed to set Python language: {}", e))?;
@@ -41,7 +42,7 @@ impl TreeSitterSearcher {
// Initialize JavaScript
{
let mut parser = Parser::new();
let language: Language = tree_sitter_javascript::language().into();
let language: Language = tree_sitter_javascript::LANGUAGE.into();
parser
.set_language(&language)
.map_err(|e| anyhow!("Failed to set JavaScript language: {}", e))?;
@@ -59,7 +60,7 @@ impl TreeSitterSearcher {
// Initialize TypeScript
{
let mut parser = Parser::new();
let language: Language = tree_sitter_typescript::language_typescript().into();
let language: Language = tree_sitter_typescript::LANGUAGE_TYPESCRIPT.into();
parser
.set_language(&language)
.map_err(|e| anyhow!("Failed to set TypeScript language: {}", e))?;
@@ -77,7 +78,7 @@ impl TreeSitterSearcher {
// Initialize Go
{
let mut parser = Parser::new();
let language: Language = tree_sitter_go::language().into();
let language: Language = tree_sitter_go::LANGUAGE.into();
parser
.set_language(&language)
.map_err(|e| anyhow!("Failed to set Go language: {}", e))?;
@@ -88,7 +89,7 @@ impl TreeSitterSearcher {
// Initialize Java
{
let mut parser = Parser::new();
let language: Language = tree_sitter_java::language().into();
let language: Language = tree_sitter_java::LANGUAGE.into();
parser
.set_language(&language)
.map_err(|e| anyhow!("Failed to set Java language: {}", e))?;
@@ -99,7 +100,7 @@ impl TreeSitterSearcher {
// Initialize C
{
let mut parser = Parser::new();
let language: Language = tree_sitter_c::language().into();
let language: Language = tree_sitter_c::LANGUAGE.into();
parser
.set_language(&language)
.map_err(|e| anyhow!("Failed to set C language: {}", e))?;
@@ -110,7 +111,7 @@ impl TreeSitterSearcher {
// Initialize C++
{
let mut parser = Parser::new();
let language: Language = tree_sitter_cpp::language().into();
let language: Language = tree_sitter_cpp::LANGUAGE.into();
parser
.set_language(&language)
.map_err(|e| anyhow!("Failed to set C++ language: {}", e))?;
@@ -118,15 +119,37 @@ impl TreeSitterSearcher {
languages.insert("cpp".to_string(), language);
}
// Initialize Kotlin
// // 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
{
let mut parser = Parser::new();
let language: Language = tree_sitter_kotlin::language().into();
let language: Language = tree_sitter_haskell::LANGUAGE.into();
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);
.map_err(|e| anyhow!("Failed to set Haskell language: {}", e))?;
parsers.insert("haskell".to_string(), parser);
languages.insert("haskell".to_string(), language);
}
// Initialize Scheme
{
let mut parser = Parser::new();
let language: Language = tree_sitter_scheme::LANGUAGE.into();
parser
.set_language(&language)
.map_err(|e| anyhow!("Failed to set Scheme language: {}", e))?;
parsers.insert("scheme".to_string(), parser);
languages.insert("scheme".to_string(), language);
}
if parsers.is_empty() {
@@ -232,13 +255,14 @@ impl TreeSitterSearcher {
if let Ok(source_code) = fs::read_to_string(path) {
if let Some(tree) = parser.parse(&source_code, None) {
let mut cursor = QueryCursor::new();
let query_matches = cursor.matches(
let mut query_matches = cursor.matches(
&query,
tree.root_node(),
source_code.as_bytes(),
);
for query_match in query_matches {
query_matches.advance();
while let Some(query_match) = query_matches.get() {
if matches.len() >= max_matches {
break;
}
@@ -284,6 +308,8 @@ impl TreeSitterSearcher {
captures: captures_map,
context,
});
query_matches.advance();
}
}
}
@@ -311,6 +337,8 @@ impl TreeSitterSearcher {
("c", Some("c" | "h")) => true,
("cpp", Some("cpp" | "cc" | "cxx" | "hpp" | "hxx" | "h")) => true,
("kotlin", Some("kt" | "kts")) => true,
("haskell", Some("hs" | "lhs")) => true,
("scheme", Some("scm" | "ss" | "sld" | "sls")) => true,
_ => false,
}
}