Skip to content

Commit b070941

Browse files
committed
fix: resolve merge conflicts with main (Julia native port)
2 parents 0f7006e + aa7812b commit b070941

11 files changed

Lines changed: 803 additions & 8 deletions

File tree

Cargo.lock

Lines changed: 11 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crates/codegraph-core/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ tree-sitter-dart = "0.0.4"
3636
tree-sitter-zig = "1"
3737
tree-sitter-haskell = "0.23"
3838
tree-sitter-ocaml = "0.24"
39+
tree-sitter-julia = "0.23"
3940
tree-sitter-clojure-orchard = "0.2"
4041
tree-sitter-r = "1.2"
4142
rayon = "1"

crates/codegraph-core/src/change_detection.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -774,15 +774,14 @@ mod tests {
774774

775775
#[test]
776776
fn detect_removed_skips_unsupported_extensions() {
777-
// Files in WASM-only languages (Gleam, Julia, F#) live in
777+
// Files in WASM-only languages (Gleam, F#) live in
778778
// `file_hashes` because the JS-side WASM backfill writes them, but
779779
// Rust's narrower file_collector never collects them. Without this
780780
// skip, every incremental rebuild would flag them as removed and
781781
// purge their rows — the #1066 ~2s floor.
782782
let mut existing = HashMap::new();
783783
for path in [
784784
"tests/fixtures/gleam/main.gleam",
785-
"tests/fixtures/julia/main.jl",
786785
"tests/fixtures/fsharp/Main.fs",
787786
] {
788787
existing.insert(

crates/codegraph-core/src/extractors/helpers.rs

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -374,6 +374,16 @@ pub const OCAML_AST_CONFIG: LangAstConfig = LangAstConfig {
374374
string_prefixes: &[],
375375
};
376376

377+
pub const JULIA_AST_CONFIG: LangAstConfig = LangAstConfig {
378+
new_types: &[],
379+
throw_types: &[],
380+
await_types: &[],
381+
string_types: &["string_literal", "prefixed_string_literal"],
382+
regex_types: &[],
383+
quote_chars: &['"'],
384+
string_prefixes: &[],
385+
};
386+
377387
pub const CLOJURE_AST_CONFIG: LangAstConfig = LangAstConfig {
378388
new_types: &[],
379389
throw_types: &[],

0 commit comments

Comments
 (0)