Skip to content

Commit 3c74d43

Browse files
committed
fix: resolve merge conflicts with main (Julia)
2 parents 769987a + aa7812b commit 3c74d43

11 files changed

Lines changed: 804 additions & 9 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
@@ -37,6 +37,7 @@ tree-sitter-zig = "1"
3737
tree-sitter-haskell = "0.23"
3838
tree-sitter-ocaml = "0.24"
3939
tree-sitter-objc = "3"
40+
tree-sitter-julia = "0.23"
4041
tree-sitter-clojure-orchard = "0.2"
4142
rayon = "1"
4243
ignore = "0.4"

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
@@ -387,6 +387,16 @@ pub const OBJC_AST_CONFIG: LangAstConfig = LangAstConfig {
387387
string_prefixes: &[],
388388
};
389389

390+
pub const JULIA_AST_CONFIG: LangAstConfig = LangAstConfig {
391+
new_types: &[],
392+
throw_types: &[],
393+
await_types: &[],
394+
string_types: &["string_literal", "prefixed_string_literal"],
395+
regex_types: &[],
396+
quote_chars: &['"'],
397+
string_prefixes: &[],
398+
};
399+
390400
pub const CLOJURE_AST_CONFIG: LangAstConfig = LangAstConfig {
391401
new_types: &[],
392402
throw_types: &[],

0 commit comments

Comments
 (0)