diff --git a/crates/tracedecay-code-index/src/ast_grep_search.rs b/crates/tracedecay-code-index/src/ast_grep_search.rs index 32ef5b76a0..af10e8d01d 100644 --- a/crates/tracedecay-code-index/src/ast_grep_search.rs +++ b/crates/tracedecay-code-index/src/ast_grep_search.rs @@ -831,4 +831,52 @@ mod tests { ); assert!(result.lines_visited < TOTAL_LINES); } + + #[test] + fn submodule_sources_are_parsed_only_under_the_opt_in() { + let fixture = crate::source_walk::submodules::tests::fixture(); + let parent = fixture.path().join("parent"); + let disabled = search_tree( + &parent, + "pub fn $N() {}", + Some("rust"), + None, + 10, + &no_exclusions(), + ) + .expect("default ast-grep"); + assert!( + disabled + .matches + .iter() + .any(|hit| hit.file.as_ref() == "parent.rs"), + "the parent source is parsed: {:?}", + disabled.matches + ); + assert!( + disabled + .matches + .iter() + .all(|hit| !hit.file.starts_with("app/")), + "{:?}", + disabled.matches + ); + let enabled = search_tree( + &parent, + "pub fn $N() {}", + Some("rust"), + None, + 10, + &no_exclusions().with_submodules(true), + ) + .expect("opt-in ast-grep"); + assert!( + enabled + .matches + .iter() + .any(|hit| hit.file.as_ref() == "app/first.rs"), + "{:?}", + enabled.matches + ); + } } diff --git a/crates/tracedecay-code-index/src/grep_search.rs b/crates/tracedecay-code-index/src/grep_search.rs index b174387dcb..c50fb81ed8 100644 --- a/crates/tracedecay-code-index/src/grep_search.rs +++ b/crates/tracedecay-code-index/src/grep_search.rs @@ -582,4 +582,45 @@ mod tests { ); assert!(result.lines_visited < TOTAL_LINES); } + + #[test] + fn submodule_sources_are_searchable_only_under_the_opt_in() { + let fixture = crate::source_walk::submodules::tests::fixture(); + let parent = fixture.path().join("parent"); + let mut query = query("pub fn"); + query.max_results = 10; + let disabled = search_tree_with_cancel(&parent, &query, &no_exclusions(), || false) + .expect("default grep"); + assert!( + disabled + .hits + .iter() + .any(|hit| hit.file.as_ref() == "parent.rs"), + "the parent source is searched: {:?}", + disabled.hits + ); + assert!( + disabled + .hits + .iter() + .all(|hit| !hit.file.starts_with("app/")), + "{:?}", + disabled.hits + ); + let enabled = search_tree_with_cancel( + &parent, + &query, + &no_exclusions().with_submodules(true), + || false, + ) + .expect("opt-in grep"); + assert!( + enabled + .hits + .iter() + .any(|hit| hit.file.as_ref() == "app/first.rs"), + "{:?}", + enabled.hits + ); + } } diff --git a/crates/tracedecay-code-index/src/source_walk.rs b/crates/tracedecay-code-index/src/source_walk.rs index a2bb37cada..cbec609b10 100644 --- a/crates/tracedecay-code-index/src/source_walk.rs +++ b/crates/tracedecay-code-index/src/source_walk.rs @@ -901,6 +901,26 @@ mod tests { ); } + #[test] + fn linked_worktree_inside_the_parent_stays_pruned_under_submodule_opt_in() { + let fixture = crate::source_walk::submodules::tests::fixture(); + let parent = fixture.path().join("parent"); + fixture_git(&parent, &["worktree", "add", "-q", "linked"]); + let policy = IndexPathPolicyV1::new(Vec::new(), Vec::new()) + .expect("empty policy") + .with_submodules(true); + let walked = walked_files(&parent, &policy); + assert!(walked.contains(&PathBuf::from("parent.rs")), "{walked:?}"); + assert!( + walked.contains(&PathBuf::from("app/first.rs")), + "{walked:?}" + ); + assert!( + !walked.iter().any(|path| path.starts_with("linked")), + "a linked worktree is not a registered submodule: {walked:?}" + ); + } + fn fixture_git(root: &std::path::Path, args: &[&str]) -> std::process::Output { let program = tracedecay_runtime_core::git::try_git_program().expect("Git program"); let mut command = std::process::Command::new(program);