Skip to content

perf: compute CFG in Rust native engine for all languages #342

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
carlos-alm wants to merge 6 commits into
base: main
Choose a base branch
from
Open

perf: compute CFG in Rust native engine for all languages #342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3d1f41c
perf: compute CFG in Rust native engine for all languages
carlos-alm Mar 4, 2026
c252834
fix(native): use consistent "csharp" language ID and skip CFG for Go …
carlos-alm Mar 4, 2026
e877909
fix(native): pass source bytes to CfgBuilder and use fallthrough for …
carlos-alm Mar 5, 2026
bfd0ade
fix(cfg): address PR #342 review comments
carlos-alm Mar 5, 2026
e028f38
fix(cfg): add Java switch_statement to CFG rules and fix C# test fixture
carlos-alm Mar 5, 2026
e020420
fix(cfg): handle multiple catch clauses and fix label map resolution
carlos-alm Mar 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,068 changes: 1,068 additions & 0 deletions crates/codegraph-core/src/cfg.rs
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions crates/codegraph-core/src/complexity.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@ pub fn lang_rules(lang_id: &str) -> Option<&'static LangRules> {
"go" => Some(&GO_RULES),
"rust" => Some(&RUST_LANG_RULES),
"java" => Some(&JAVA_RULES),
"c_sharp" => Some(&CSHARP_RULES),
"csharp" => Some(&CSHARP_RULES),
"ruby" => Some(&RUBY_RULES),
"php" => Some(&PHP_RULES),
_ => None,
Expand Down Expand Up @@ -850,7 +850,7 @@ pub fn halstead_rules(lang_id: &str) -> Option<&'static HalsteadRules> {
"go" => Some(&GO_HALSTEAD),
"rust" => Some(&RUST_HALSTEAD),
"java" => Some(&JAVA_HALSTEAD),
"c_sharp" => Some(&CSHARP_HALSTEAD),
"csharp" => Some(&CSHARP_HALSTEAD),
"ruby" => Some(&RUBY_HALSTEAD),
"php" => Some(&PHP_HALSTEAD),
_ => None,
Expand All @@ -860,7 +860,7 @@ pub fn halstead_rules(lang_id: &str) -> Option<&'static HalsteadRules> {
/// Comment line prefixes per language, used for LOC metrics.
pub fn comment_prefixes(lang_id: &str) -> &'static [&'static str] {
match lang_id {
"javascript" | "typescript" | "tsx" | "go" | "rust" | "java" | "c_sharp" => {
"javascript" | "typescript" | "tsx" | "go" | "rust" | "java" | "csharp" => {
&["//", "/*", "*", "*/"]
}
"python" | "ruby" => &["#"],
Expand Down
18 changes: 14 additions & 4 deletions crates/codegraph-core/src/extractors/csharp.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
use tree_sitter::{Node, Tree};
use crate::cfg::build_function_cfg;
use crate::complexity::compute_all_metrics;
use crate::types::*;
use super::helpers::*;
Expand Down Expand Up @@ -45,6 +46,7 @@ fn walk_node(node: &Node, source: &[u8], symbols: &mut FileSymbols) {
end_line: Some(end_line(node)),
decorators: None,
complexity: None,
cfg: None,
children: opt_children(children),
});
extract_csharp_base_types(node, &class_name, source, symbols);
Expand All @@ -61,6 +63,7 @@ fn walk_node(node: &Node, source: &[u8], symbols: &mut FileSymbols) {
end_line: Some(end_line(node)),
decorators: None,
complexity: None,
cfg: None,
children: None,
});
extract_csharp_base_types(node, &name, source, symbols);
Expand All @@ -77,6 +80,7 @@ fn walk_node(node: &Node, source: &[u8], symbols: &mut FileSymbols) {
end_line: Some(end_line(node)),
decorators: None,
complexity: None,
cfg: None,
children: None,
});
extract_csharp_base_types(node, &name, source, symbols);
Expand All @@ -93,6 +97,7 @@ fn walk_node(node: &Node, source: &[u8], symbols: &mut FileSymbols) {
end_line: Some(end_line(node)),
decorators: None,
complexity: None,
cfg: None,
children: None,
});
if let Some(body) = node.child_by_field_name("body") {
Expand All @@ -110,7 +115,8 @@ fn walk_node(node: &Node, source: &[u8], symbols: &mut FileSymbols) {
line: start_line(&child),
end_line: Some(end_line(&child)),
decorators: None,
complexity: compute_all_metrics(&child, source, "c_sharp"),
complexity: compute_all_metrics(&child, source, "csharp"),
cfg: build_function_cfg(&child, "csharp", source),
children: None,
});
}
Expand All @@ -132,6 +138,7 @@ fn walk_node(node: &Node, source: &[u8], symbols: &mut FileSymbols) {
end_line: Some(end_line(node)),
decorators: None,
complexity: None,
cfg: None,
children: opt_children(children),
});
}
Expand All @@ -152,7 +159,8 @@ fn walk_node(node: &Node, source: &[u8], symbols: &mut FileSymbols) {
line: start_line(node),
end_line: Some(end_line(node)),
decorators: None,
complexity: compute_all_metrics(node, source, "c_sharp"),
complexity: compute_all_metrics(node, source, "csharp"),
cfg: build_function_cfg(node, "csharp", source),
children: opt_children(children),
});
}
Expand All @@ -173,7 +181,8 @@ fn walk_node(node: &Node, source: &[u8], symbols: &mut FileSymbols) {
line: start_line(node),
end_line: Some(end_line(node)),
decorators: None,
complexity: compute_all_metrics(node, source, "c_sharp"),
complexity: compute_all_metrics(node, source, "csharp"),
cfg: build_function_cfg(node, "csharp", source),
children: opt_children(children),
});
}
Expand All @@ -193,7 +202,8 @@ fn walk_node(node: &Node, source: &[u8], symbols: &mut FileSymbols) {
line: start_line(node),
end_line: Some(end_line(node)),
decorators: None,
complexity: compute_all_metrics(node, source, "c_sharp"),
complexity: compute_all_metrics(node, source, "csharp"),
cfg: build_function_cfg(node, "csharp", source),
children: None,
});
}
Expand Down
8 changes: 8 additions & 0 deletions crates/codegraph-core/src/extractors/go.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
use tree_sitter::{Node, Tree};
use crate::cfg::build_function_cfg;
use crate::complexity::compute_all_metrics;
use crate::types::*;
use super::helpers::*;
Expand Down Expand Up @@ -27,6 +28,7 @@ fn walk_node(node: &Node, source: &[u8], symbols: &mut FileSymbols) {
end_line: Some(end_line(node)),
decorators: None,
complexity: compute_all_metrics(node, source, "go"),
cfg: build_function_cfg(node, "go", source),
children: opt_children(children),
});
}
Expand Down Expand Up @@ -65,6 +67,7 @@ fn walk_node(node: &Node, source: &[u8], symbols: &mut FileSymbols) {
end_line: Some(end_line(node)),
decorators: None,
complexity: compute_all_metrics(node, source, "go"),
cfg: build_function_cfg(node, "go", source),
children: opt_children(children),
});
}
Expand All @@ -90,6 +93,7 @@ fn walk_node(node: &Node, source: &[u8], symbols: &mut FileSymbols) {
end_line: Some(end_line(node)),
decorators: None,
complexity: None,
cfg: None,
children: opt_children(children),
});
}
Expand All @@ -101,6 +105,7 @@ fn walk_node(node: &Node, source: &[u8], symbols: &mut FileSymbols) {
end_line: Some(end_line(node)),
decorators: None,
complexity: None,
cfg: None,
children: None,
});
// Extract interface methods
Expand All @@ -121,6 +126,7 @@ fn walk_node(node: &Node, source: &[u8], symbols: &mut FileSymbols) {
end_line: Some(end_line(&member)),
decorators: None,
complexity: None,
cfg: None,
children: None,
});
}
Expand All @@ -136,6 +142,7 @@ fn walk_node(node: &Node, source: &[u8], symbols: &mut FileSymbols) {
end_line: Some(end_line(node)),
decorators: None,
complexity: None,
cfg: None,
children: None,
});
}
Expand All @@ -157,6 +164,7 @@ fn walk_node(node: &Node, source: &[u8], symbols: &mut FileSymbols) {
end_line: Some(end_line(&spec)),
decorators: None,
complexity: None,
cfg: None,
children: None,
});
}
Expand Down
1 change: 1 addition & 0 deletions crates/codegraph-core/src/extractors/hcl.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ fn walk_node(node: &Node, source: &[u8], symbols: &mut FileSymbols) {
end_line: Some(end_line(node)),
decorators: None,
complexity: None,
cfg: None,
children: None,
});

Expand Down
1 change: 1 addition & 0 deletions crates/codegraph-core/src/extractors/helpers.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ pub fn child_def(name: String, kind: &str, line: u32) -> Definition {
end_line: None,
decorators: None,
complexity: None,
cfg: None,
children: None,
}
}
Expand Down
7 changes: 7 additions & 0 deletions crates/codegraph-core/src/extractors/java.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
use tree_sitter::{Node, Tree};
use crate::cfg::build_function_cfg;
use crate::complexity::compute_all_metrics;
use crate::types::*;
use super::helpers::*;
Expand Down Expand Up @@ -44,6 +45,7 @@ fn walk_node(node: &Node, source: &[u8], symbols: &mut FileSymbols) {
end_line: Some(end_line(node)),
decorators: None,
complexity: None,
cfg: None,
children: opt_children(children),
});

Expand Down Expand Up @@ -97,6 +99,7 @@ fn walk_node(node: &Node, source: &[u8], symbols: &mut FileSymbols) {
end_line: Some(end_line(node)),
decorators: None,
complexity: None,
cfg: None,
children: None,
});
if let Some(body) = node.child_by_field_name("body") {
Expand All @@ -115,6 +118,7 @@ fn walk_node(node: &Node, source: &[u8], symbols: &mut FileSymbols) {
end_line: Some(end_line(&child)),
decorators: None,
complexity: compute_all_metrics(&child, source, "java"),
cfg: build_function_cfg(&child, "java", source),
children: None,
});
}
Expand All @@ -136,6 +140,7 @@ fn walk_node(node: &Node, source: &[u8], symbols: &mut FileSymbols) {
end_line: Some(end_line(node)),
decorators: None,
complexity: None,
cfg: None,
children: opt_children(children),
});
}
Expand All @@ -157,6 +162,7 @@ fn walk_node(node: &Node, source: &[u8], symbols: &mut FileSymbols) {
end_line: Some(end_line(node)),
decorators: None,
complexity: compute_all_metrics(node, source, "java"),
cfg: build_function_cfg(node, "java", source),
children: opt_children(children),
});
}
Expand All @@ -178,6 +184,7 @@ fn walk_node(node: &Node, source: &[u8], symbols: &mut FileSymbols) {
end_line: Some(end_line(node)),
decorators: None,
complexity: compute_all_metrics(node, source, "java"),
cfg: build_function_cfg(node, "java", source),
children: opt_children(children),
});
}
Expand Down
13 changes: 13 additions & 0 deletions crates/codegraph-core/src/extractors/javascript.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
use tree_sitter::{Node, Tree};
use crate::cfg::build_function_cfg;
use crate::complexity::compute_all_metrics;
use crate::types::*;
use super::helpers::*;
Expand Down Expand Up @@ -27,6 +28,7 @@ fn walk_node(node: &Node, source: &[u8], symbols: &mut FileSymbols) {
end_line: Some(end_line(node)),
decorators: None,
complexity: compute_all_metrics(node, source, "javascript"),
cfg: build_function_cfg(node, "javascript", source),
children: opt_children(children),
});
}
Expand All @@ -43,6 +45,7 @@ fn walk_node(node: &Node, source: &[u8], symbols: &mut FileSymbols) {
end_line: Some(end_line(node)),
decorators: None,
complexity: None,
cfg: None,
children: opt_children(children),
});

Expand Down Expand Up @@ -87,6 +90,7 @@ fn walk_node(node: &Node, source: &[u8], symbols: &mut FileSymbols) {
end_line: Some(end_line(node)),
decorators: None,
complexity: compute_all_metrics(node, source, "javascript"),
cfg: build_function_cfg(node, "javascript", source),
children: opt_children(children),
});
}
Expand All @@ -102,6 +106,7 @@ fn walk_node(node: &Node, source: &[u8], symbols: &mut FileSymbols) {
end_line: Some(end_line(node)),
decorators: None,
complexity: None,
cfg: None,
children: None,
});
// Extract interface methods
Expand All @@ -124,6 +129,7 @@ fn walk_node(node: &Node, source: &[u8], symbols: &mut FileSymbols) {
end_line: Some(end_line(node)),
decorators: None,
complexity: None,
cfg: None,
children: None,
});
}
Expand All @@ -141,6 +147,7 @@ fn walk_node(node: &Node, source: &[u8], symbols: &mut FileSymbols) {
end_line: Some(end_line(node)),
decorators: None,
complexity: None,
cfg: None,
children: opt_children(children),
});
}
Expand Down Expand Up @@ -169,6 +176,7 @@ fn walk_node(node: &Node, source: &[u8], symbols: &mut FileSymbols) {
end_line: Some(end_line(&value_n)),
decorators: None,
complexity: compute_all_metrics(&value_n, source, "javascript"),
cfg: build_function_cfg(&value_n, "javascript", source),
children: opt_children(children),
});
} else if is_const && is_js_literal(&value_n)
Expand All @@ -184,6 +192,7 @@ fn walk_node(node: &Node, source: &[u8], symbols: &mut FileSymbols) {
end_line: Some(end_line(node)),
decorators: None,
complexity: None,
cfg: None,
children: None,
});
}
Expand Down Expand Up @@ -703,6 +712,7 @@ fn extract_interface_methods(
end_line: Some(end_line(&child)),
decorators: None,
complexity: None,
cfg: None,
children: None,
});
}
Expand Down Expand Up @@ -919,6 +929,7 @@ fn extract_callback_definition(call_node: &Node, source: &[u8]) -> Option<Defini
end_line: Some(end_line(&cb)),
decorators: None,
complexity: compute_all_metrics(&cb, source, "javascript"),
cfg: build_function_cfg(&cb, "javascript", source),
children: None,
});
}
Expand All @@ -937,6 +948,7 @@ fn extract_callback_definition(call_node: &Node, source: &[u8]) -> Option<Defini
end_line: Some(end_line(&cb)),
decorators: None,
complexity: compute_all_metrics(&cb, source, "javascript"),
cfg: build_function_cfg(&cb, "javascript", source),
children: None,
});
}
Expand All @@ -952,6 +964,7 @@ fn extract_callback_definition(call_node: &Node, source: &[u8]) -> Option<Defini
end_line: Some(end_line(&cb)),
decorators: None,
complexity: compute_all_metrics(&cb, source, "javascript"),
cfg: build_function_cfg(&cb, "javascript", source),
children: None,
});
}
Expand Down
Loading