Skip to main content

fallow_core/
changed_files.rs

1//! Git-aware "changed files" filtering shared between fallow-cli and fallow-lsp.
2//!
3//! Provides:
4//! - [`validate_git_ref`] for input validation at trust boundaries.
5//! - [`ChangedFilesError`] / [`try_get_changed_files`] / [`get_changed_files`]
6//!   for resolving a git ref into the set of changed files.
7//! - [`filter_results_by_changed_files`] for narrowing an [`AnalysisResults`]
8//!   to issues in those files.
9//! - [`filter_duplication_by_changed_files`] for narrowing a
10//!   [`DuplicationReport`] to clone groups touching at least one changed file.
11//!
12//! Both filters intentionally exclude dependency-level issues (unused deps,
13//! type-only deps, test-only deps) since "unused dependency" is a function of
14//! the entire import graph and can't be attributed to individual changed files.
15
16use std::path::{Path, PathBuf};
17
18use rustc_hash::{FxHashMap, FxHashSet};
19
20use crate::duplicates::{DuplicationReport, DuplicationStats, families};
21use crate::results::AnalysisResults;
22
23/// Validate a user-supplied git ref before passing it to `git diff`.
24///
25/// Rejects empty strings, refs starting with `-` (which `git` would interpret
26/// as an option flag), and characters outside the safe allowlist for branch
27/// names, tags, SHAs, and reflog expressions (`HEAD~N`, `HEAD@{...}`).
28///
29/// Inside `@{...}` braces, colons and spaces are allowed so reflog timestamps
30/// like `HEAD@{2025-01-01}` and `HEAD@{1 week ago}` round-trip.
31///
32/// Used by both the CLI (clap value parser) and the LSP (initializationOptions
33/// trust boundary) to fail fast with a readable error rather than handing a
34/// malformed ref to git.
35pub fn validate_git_ref(s: &str) -> Result<&str, String> {
36    if s.is_empty() {
37        return Err("git ref cannot be empty".to_string());
38    }
39    if s.starts_with('-') {
40        return Err("git ref cannot start with '-'".to_string());
41    }
42    let mut in_braces = false;
43    for c in s.chars() {
44        match c {
45            '{' => in_braces = true,
46            '}' => in_braces = false,
47            ':' | ' ' if in_braces => {}
48            c if c.is_ascii_alphanumeric()
49                || matches!(c, '.' | '_' | '-' | '/' | '~' | '^' | '@' | '{' | '}') => {}
50            _ => return Err(format!("git ref contains disallowed character: '{c}'")),
51        }
52    }
53    if in_braces {
54        return Err("git ref has unclosed '{'".to_string());
55    }
56    Ok(s)
57}
58
59/// Classification of a `git diff` failure, so callers can pick their own
60/// wording (soft warning vs hard error) without re-parsing stderr.
61#[derive(Debug)]
62pub enum ChangedFilesError {
63    /// Git ref failed validation before invoking `git`.
64    InvalidRef(String),
65    /// `git` binary not found / not executable.
66    GitMissing(String),
67    /// Command ran but the directory isn't a git repository.
68    NotARepository,
69    /// Command ran but the ref is invalid / another git error.
70    GitFailed(String),
71}
72
73impl ChangedFilesError {
74    /// Human-readable clause suitable for embedding in an error message.
75    /// Does not include the flag name (e.g. "--changed-since") so callers can
76    /// prepend their own context.
77    pub fn describe(&self) -> String {
78        match self {
79            Self::InvalidRef(e) => format!("invalid git ref: {e}"),
80            Self::GitMissing(e) => format!("failed to run git: {e}"),
81            Self::NotARepository => "not a git repository".to_owned(),
82            Self::GitFailed(stderr) => augment_git_failed(stderr),
83        }
84    }
85}
86
87/// Enrich a raw `git diff` stderr with actionable hints when the failure mode
88/// is recognizable. Today: shallow-clone misses (`actions/checkout@v4` defaults
89/// to `fetch-depth: 1`, GitLab CI to `GIT_DEPTH: 50`), where the baseline ref
90/// predates the fetch boundary. Bare git stderr is famously cryptic; a hint
91/// here is much more useful than a docs link the reader has to chase.
92fn augment_git_failed(stderr: &str) -> String {
93    let lower = stderr.to_ascii_lowercase();
94    if lower.contains("not a valid object name")
95        || lower.contains("unknown revision")
96        || lower.contains("ambiguous argument")
97    {
98        format!(
99            "{stderr} (shallow clone? try `git fetch --unshallow`, or set `fetch-depth: 0` on actions/checkout / `GIT_DEPTH: 0` in GitLab CI)"
100        )
101    } else {
102        stderr.to_owned()
103    }
104}
105
106/// Resolve the canonical git toplevel for `cwd`.
107///
108/// Runs `git rev-parse --show-toplevel`, which is git's own answer to "where
109/// does this repository live?". The returned path is canonicalized so it
110/// agrees with paths produced by `fs::canonicalize` elsewhere on macOS
111/// (`/tmp` -> `/private/tmp`) and Windows (8.3 short paths).
112///
113/// Used by `try_get_changed_files` to produce changed-file paths whose
114/// absolute form matches what the analysis pipeline emits, regardless of
115/// whether the caller's `cwd` is the repo root or a subdirectory of it.
116pub fn resolve_git_toplevel(cwd: &Path) -> Result<PathBuf, ChangedFilesError> {
117    let output = git_command(cwd, &["rev-parse", "--show-toplevel"])
118        .output()
119        .map_err(|e| ChangedFilesError::GitMissing(e.to_string()))?;
120
121    if !output.status.success() {
122        let stderr = String::from_utf8_lossy(&output.stderr);
123        return Err(if stderr.contains("not a git repository") {
124            ChangedFilesError::NotARepository
125        } else {
126            ChangedFilesError::GitFailed(stderr.trim().to_owned())
127        });
128    }
129
130    let raw = String::from_utf8_lossy(&output.stdout);
131    let trimmed = raw.trim();
132    if trimmed.is_empty() {
133        return Err(ChangedFilesError::GitFailed(
134            "git rev-parse --show-toplevel returned empty output".to_owned(),
135        ));
136    }
137
138    let path = PathBuf::from(trimmed);
139    Ok(path.canonicalize().unwrap_or(path))
140}
141
142fn collect_git_paths(
143    cwd: &Path,
144    toplevel: &Path,
145    args: &[&str],
146) -> Result<FxHashSet<PathBuf>, ChangedFilesError> {
147    let output = git_command(cwd, args)
148        .output()
149        .map_err(|e| ChangedFilesError::GitMissing(e.to_string()))?;
150
151    if !output.status.success() {
152        let stderr = String::from_utf8_lossy(&output.stderr);
153        return Err(if stderr.contains("not a git repository") {
154            ChangedFilesError::NotARepository
155        } else {
156            ChangedFilesError::GitFailed(stderr.trim().to_owned())
157        });
158    }
159
160    // All callers use modes whose output is repository-root-relative
161    // (`git diff --name-only`, `git ls-files --full-name --others`). Joining
162    // against `toplevel` yields absolute paths that line up with what
163    // `analyze_project` emits when given a canonical workspace root, even if
164    // the LSP / CLI was invoked from a subdirectory.
165    let files: FxHashSet<PathBuf> = String::from_utf8_lossy(&output.stdout)
166        .lines()
167        .filter(|line| !line.is_empty())
168        .map(|line| toplevel.join(line))
169        .collect();
170
171    Ok(files)
172}
173
174fn git_command(cwd: &Path, args: &[&str]) -> std::process::Command {
175    let mut command = std::process::Command::new("git");
176    command.args(args).current_dir(cwd);
177    crate::git_env::clear_ambient_git_env(&mut command);
178    command
179}
180
181/// Get files changed since a git ref. Returns `Err` (with details) when the
182/// git invocation itself failed, so callers can choose between warn-and-ignore
183/// and hard-error behavior.
184///
185/// Includes both:
186/// - committed changes from the merge-base range `git_ref...HEAD`
187/// - tracked staged/unstaged changes from `HEAD` to the current worktree
188/// - untracked files not ignored by Git
189///
190/// This keeps `--changed-since` useful for local validation instead of only
191/// reflecting the last committed `HEAD`.
192///
193/// All paths in the returned set are absolute and rooted at the canonical
194/// git toplevel, not at `root`. This matters when the LSP / CLI is invoked
195/// from a subdirectory of the repository (e.g., a Turborepo workspace at
196/// `apps/web`): `git diff` emits root-relative paths, and we need to join
197/// them against the actual repo root rather than the caller's cwd.
198pub fn try_get_changed_files(
199    root: &Path,
200    git_ref: &str,
201) -> Result<FxHashSet<PathBuf>, ChangedFilesError> {
202    // Validate the ref BEFORE resolving the toplevel so the security-relevant
203    // boundary check (rejects refs starting with `-`, etc.) runs even when
204    // `cwd` happens to not be a git repo. Otherwise an attacker-controlled
205    // `--changed-since=--upload-pack=evil` would leak through to
206    // `git rev-parse` instead of being rejected at validation.
207    validate_git_ref(git_ref).map_err(ChangedFilesError::InvalidRef)?;
208    let toplevel = resolve_git_toplevel(root)?;
209    try_get_changed_files_with_toplevel(root, &toplevel, git_ref)
210}
211
212/// Like [`try_get_changed_files`], but takes a pre-resolved canonical
213/// `toplevel` so callers (the LSP) can cache it across runs and avoid the
214/// extra `git rev-parse --show-toplevel` subprocess on every save.
215///
216/// `toplevel` MUST be the canonical git toplevel for `cwd`; passing anything
217/// else produces incorrect changed-file paths. The CLI does not call this
218/// directly: it uses [`try_get_changed_files`] which resolves on each call.
219pub fn try_get_changed_files_with_toplevel(
220    cwd: &Path,
221    toplevel: &Path,
222    git_ref: &str,
223) -> Result<FxHashSet<PathBuf>, ChangedFilesError> {
224    validate_git_ref(git_ref).map_err(ChangedFilesError::InvalidRef)?;
225
226    let mut files = collect_git_paths(
227        cwd,
228        toplevel,
229        &[
230            "diff",
231            "--name-only",
232            "--end-of-options",
233            &format!("{git_ref}...HEAD"),
234        ],
235    )?;
236    files.extend(collect_git_paths(
237        cwd,
238        toplevel,
239        &["diff", "--name-only", "HEAD"],
240    )?);
241    // `--full-name` forces `ls-files` to emit repository-root-relative paths,
242    // matching `git diff`'s default. Without it, `ls-files` emits paths
243    // relative to cwd, which silently produces wrong joins when the caller
244    // invokes from a subdirectory.
245    files.extend(collect_git_paths(
246        cwd,
247        toplevel,
248        &["ls-files", "--full-name", "--others", "--exclude-standard"],
249    )?);
250    Ok(files)
251}
252
253/// Get files changed since a git ref. Returns `None` on git failure after
254/// printing a warning to stderr. Used by `--changed-since` and `--file`, where
255/// a failure falls back to full-scope analysis.
256#[expect(
257    clippy::print_stderr,
258    reason = "intentional user-facing warning for the CLI's --changed-since fallback path; LSP callers use try_get_changed_files instead"
259)]
260pub fn get_changed_files(root: &Path, git_ref: &str) -> Option<FxHashSet<PathBuf>> {
261    match try_get_changed_files(root, git_ref) {
262        Ok(files) => Some(files),
263        Err(ChangedFilesError::InvalidRef(e)) => {
264            eprintln!("Warning: --changed-since ignored: invalid git ref: {e}");
265            None
266        }
267        Err(ChangedFilesError::GitMissing(e)) => {
268            eprintln!("Warning: --changed-since ignored: failed to run git: {e}");
269            None
270        }
271        Err(ChangedFilesError::NotARepository) => {
272            eprintln!("Warning: --changed-since ignored: not a git repository");
273            None
274        }
275        Err(ChangedFilesError::GitFailed(stderr)) => {
276            eprintln!("Warning: --changed-since failed for ref '{git_ref}': {stderr}");
277            None
278        }
279    }
280}
281
282/// Filter `results` to only include issues whose source file is in
283/// `changed_files`.
284///
285/// Dependency-level issues (unused deps, dev deps, optional deps, type-only
286/// deps, test-only deps) are intentionally NOT filtered here. Unlike
287/// file-level issues, a dependency being "unused" is a function of the entire
288/// import graph and can't be attributed to individual changed source files.
289#[expect(
290    clippy::implicit_hasher,
291    reason = "fallow standardizes on FxHashSet across the workspace"
292)]
293pub fn filter_results_by_changed_files(
294    results: &mut AnalysisResults,
295    changed_files: &FxHashSet<PathBuf>,
296) {
297    results
298        .unused_files
299        .retain(|f| changed_files.contains(&f.path));
300    results
301        .unused_exports
302        .retain(|e| changed_files.contains(&e.path));
303    results
304        .unused_types
305        .retain(|e| changed_files.contains(&e.path));
306    results
307        .private_type_leaks
308        .retain(|e| changed_files.contains(&e.path));
309    results
310        .unused_enum_members
311        .retain(|m| changed_files.contains(&m.path));
312    results
313        .unused_class_members
314        .retain(|m| changed_files.contains(&m.path));
315    results
316        .unresolved_imports
317        .retain(|i| changed_files.contains(&i.path));
318
319    // Unlisted deps: keep only if any importing file is changed
320    results.unlisted_dependencies.retain(|d| {
321        d.imported_from
322            .iter()
323            .any(|s| changed_files.contains(&s.path))
324    });
325
326    // Duplicate exports: filter locations to changed files, drop groups with < 2
327    for dup in &mut results.duplicate_exports {
328        dup.locations
329            .retain(|loc| changed_files.contains(&loc.path));
330    }
331    results.duplicate_exports.retain(|d| d.locations.len() >= 2);
332
333    // Circular deps: keep cycles where at least one file is changed
334    results
335        .circular_dependencies
336        .retain(|c| c.files.iter().any(|f| changed_files.contains(f)));
337
338    // Boundary violations: keep if the importing file changed
339    results
340        .boundary_violations
341        .retain(|v| changed_files.contains(&v.from_path));
342
343    // Stale suppressions: keep if the file changed
344    results
345        .stale_suppressions
346        .retain(|s| changed_files.contains(&s.path));
347}
348
349/// Recompute duplication statistics after filtering.
350///
351/// Uses per-file line deduplication (matching `compute_stats` in
352/// `duplicates/detect.rs`) so overlapping clone instances don't inflate the
353/// duplicated line count.
354fn recompute_duplication_stats(report: &DuplicationReport) -> DuplicationStats {
355    let mut files_with_clones: FxHashSet<&Path> = FxHashSet::default();
356    let mut file_dup_lines: FxHashMap<&Path, FxHashSet<usize>> = FxHashMap::default();
357    let mut duplicated_tokens = 0_usize;
358    let mut clone_instances = 0_usize;
359
360    for group in &report.clone_groups {
361        for instance in &group.instances {
362            files_with_clones.insert(&instance.file);
363            clone_instances += 1;
364            let lines = file_dup_lines.entry(&instance.file).or_default();
365            for line in instance.start_line..=instance.end_line {
366                lines.insert(line);
367            }
368        }
369        duplicated_tokens += group.token_count * group.instances.len();
370    }
371
372    let duplicated_lines: usize = file_dup_lines.values().map(FxHashSet::len).sum();
373
374    DuplicationStats {
375        total_files: report.stats.total_files,
376        files_with_clones: files_with_clones.len(),
377        total_lines: report.stats.total_lines,
378        duplicated_lines,
379        total_tokens: report.stats.total_tokens,
380        duplicated_tokens,
381        clone_groups: report.clone_groups.len(),
382        clone_instances,
383        #[expect(
384            clippy::cast_precision_loss,
385            reason = "stat percentages are display-only; precision loss at usize::MAX line counts is acceptable"
386        )]
387        duplication_percentage: if report.stats.total_lines > 0 {
388            (duplicated_lines as f64 / report.stats.total_lines as f64) * 100.0
389        } else {
390            0.0
391        },
392    }
393}
394
395/// Filter a duplication report to only retain clone groups where at least one
396/// instance belongs to a changed file. Families, mirrored directories, and
397/// stats are rebuilt from the surviving groups so consumers see consistent,
398/// correctly-scoped numbers.
399#[expect(
400    clippy::implicit_hasher,
401    reason = "fallow standardizes on FxHashSet across the workspace"
402)]
403pub fn filter_duplication_by_changed_files(
404    report: &mut DuplicationReport,
405    changed_files: &FxHashSet<PathBuf>,
406    root: &Path,
407) {
408    report
409        .clone_groups
410        .retain(|g| g.instances.iter().any(|i| changed_files.contains(&i.file)));
411    report.clone_families = families::group_into_families(&report.clone_groups, root);
412    report.mirrored_directories =
413        families::detect_mirrored_directories(&report.clone_families, root);
414    report.stats = recompute_duplication_stats(report);
415}
416
417#[cfg(test)]
418mod tests {
419    use super::*;
420    use crate::duplicates::{CloneGroup, CloneInstance};
421    use crate::results::{BoundaryViolation, CircularDependency, UnusedExport, UnusedFile};
422
423    #[test]
424    fn changed_files_error_describe_variants() {
425        assert!(
426            ChangedFilesError::InvalidRef("bad".to_owned())
427                .describe()
428                .contains("invalid git ref")
429        );
430        assert!(
431            ChangedFilesError::GitMissing("oops".to_owned())
432                .describe()
433                .contains("oops")
434        );
435        assert_eq!(
436            ChangedFilesError::NotARepository.describe(),
437            "not a git repository"
438        );
439        assert!(
440            ChangedFilesError::GitFailed("bad ref".to_owned())
441                .describe()
442                .contains("bad ref")
443        );
444    }
445
446    #[test]
447    fn augment_git_failed_appends_shallow_clone_hint_for_unknown_revision() {
448        let stderr = "fatal: ambiguous argument 'fallow-baseline...HEAD': unknown revision or path not in the working tree.";
449        let described = ChangedFilesError::GitFailed(stderr.to_owned()).describe();
450        assert!(described.contains(stderr), "original stderr preserved");
451        assert!(
452            described.contains("shallow clone"),
453            "hint surfaced: {described}"
454        );
455        assert!(
456            described.contains("fetch-depth: 0") || described.contains("git fetch --unshallow"),
457            "hint actionable: {described}"
458        );
459    }
460
461    #[test]
462    fn augment_git_failed_passthrough_for_other_errors() {
463        // Errors that aren't shallow-clone-related stay verbatim
464        let stderr = "fatal: refusing to merge unrelated histories";
465        let described = ChangedFilesError::GitFailed(stderr.to_owned()).describe();
466        assert_eq!(described, stderr);
467    }
468
469    #[test]
470    fn validate_git_ref_rejects_leading_dash() {
471        assert!(validate_git_ref("--upload-pack=evil").is_err());
472        assert!(validate_git_ref("-flag").is_err());
473    }
474
475    #[test]
476    fn validate_git_ref_accepts_baseline_tag() {
477        assert_eq!(
478            validate_git_ref("fallow-baseline").unwrap(),
479            "fallow-baseline"
480        );
481    }
482
483    #[test]
484    fn try_get_changed_files_rejects_invalid_ref() {
485        // Validation runs before git invocation, so any path will do
486        let err = try_get_changed_files(Path::new("/"), "--evil")
487            .expect_err("leading-dash ref must be rejected");
488        assert!(matches!(err, ChangedFilesError::InvalidRef(_)));
489        assert!(err.describe().contains("cannot start with"));
490    }
491
492    #[test]
493    fn validate_git_ref_rejects_option_like_ref() {
494        assert!(validate_git_ref("--output=/tmp/fallow-proof").is_err());
495    }
496
497    #[test]
498    fn validate_git_ref_allows_reflog_relative_date() {
499        assert!(validate_git_ref("HEAD@{1 week ago}").is_ok());
500    }
501
502    #[test]
503    fn try_get_changed_files_rejects_option_like_ref_before_git() {
504        let root = tempfile::tempdir().expect("create temp dir");
505        let proof_path = root.path().join("proof");
506
507        let result = try_get_changed_files(
508            root.path(),
509            &format!("--output={}", proof_path.to_string_lossy()),
510        );
511
512        assert!(matches!(result, Err(ChangedFilesError::InvalidRef(_))));
513        assert!(
514            !proof_path.exists(),
515            "invalid changedSince ref must not be passed through to git as an option"
516        );
517    }
518
519    #[test]
520    fn git_command_clears_parent_git_environment() {
521        let command = git_command(Path::new("."), &["status", "--short"]);
522        let overrides: Vec<_> = command.get_envs().collect();
523
524        for var in crate::git_env::AMBIENT_GIT_ENV_VARS {
525            assert!(
526                overrides
527                    .iter()
528                    .any(|(key, value)| key.to_str() == Some(*var) && value.is_none()),
529                "git helper must clear inherited {var}",
530            );
531        }
532    }
533
534    #[test]
535    fn filter_results_keeps_only_changed_files() {
536        let mut results = AnalysisResults::default();
537        results.unused_files.push(UnusedFile {
538            path: "/a.ts".into(),
539        });
540        results.unused_files.push(UnusedFile {
541            path: "/b.ts".into(),
542        });
543        results.unused_exports.push(UnusedExport {
544            path: "/a.ts".into(),
545            export_name: "foo".into(),
546            is_type_only: false,
547            line: 1,
548            col: 0,
549            span_start: 0,
550            is_re_export: false,
551        });
552
553        let mut changed: FxHashSet<PathBuf> = FxHashSet::default();
554        changed.insert("/a.ts".into());
555
556        filter_results_by_changed_files(&mut results, &changed);
557
558        assert_eq!(results.unused_files.len(), 1);
559        assert_eq!(results.unused_files[0].path, PathBuf::from("/a.ts"));
560        assert_eq!(results.unused_exports.len(), 1);
561    }
562
563    #[test]
564    fn filter_results_preserves_dependency_level_issues() {
565        let mut results = AnalysisResults::default();
566        results
567            .unused_dependencies
568            .push(crate::results::UnusedDependency {
569                package_name: "lodash".into(),
570                location: crate::results::DependencyLocation::Dependencies,
571                path: "/pkg.json".into(),
572                line: 3,
573                used_in_workspaces: Vec::new(),
574            });
575
576        let changed: FxHashSet<PathBuf> = FxHashSet::default();
577        filter_results_by_changed_files(&mut results, &changed);
578
579        // Dependency-level issues survive even when no source files changed
580        assert_eq!(results.unused_dependencies.len(), 1);
581    }
582
583    #[test]
584    fn filter_results_keeps_circular_dep_when_any_file_changed() {
585        let mut results = AnalysisResults::default();
586        results.circular_dependencies.push(CircularDependency {
587            files: vec!["/a.ts".into(), "/b.ts".into()],
588            length: 2,
589            line: 1,
590            col: 0,
591            is_cross_package: false,
592        });
593
594        let mut changed: FxHashSet<PathBuf> = FxHashSet::default();
595        changed.insert("/b.ts".into());
596
597        filter_results_by_changed_files(&mut results, &changed);
598        assert_eq!(results.circular_dependencies.len(), 1);
599    }
600
601    #[test]
602    fn filter_results_drops_circular_dep_when_no_file_changed() {
603        let mut results = AnalysisResults::default();
604        results.circular_dependencies.push(CircularDependency {
605            files: vec!["/a.ts".into(), "/b.ts".into()],
606            length: 2,
607            line: 1,
608            col: 0,
609            is_cross_package: false,
610        });
611
612        let changed: FxHashSet<PathBuf> = FxHashSet::default();
613        filter_results_by_changed_files(&mut results, &changed);
614        assert!(results.circular_dependencies.is_empty());
615    }
616
617    #[test]
618    fn filter_results_drops_boundary_violation_when_importer_unchanged() {
619        let mut results = AnalysisResults::default();
620        results.boundary_violations.push(BoundaryViolation {
621            from_path: "/a.ts".into(),
622            to_path: "/b.ts".into(),
623            from_zone: "ui".into(),
624            to_zone: "data".into(),
625            import_specifier: "../data/db".into(),
626            line: 1,
627            col: 0,
628        });
629
630        let mut changed: FxHashSet<PathBuf> = FxHashSet::default();
631        // only the imported file changed, not the importer
632        changed.insert("/b.ts".into());
633
634        filter_results_by_changed_files(&mut results, &changed);
635        assert!(results.boundary_violations.is_empty());
636    }
637
638    #[test]
639    fn filter_duplication_keeps_groups_with_at_least_one_changed_instance() {
640        let mut report = DuplicationReport {
641            clone_groups: vec![CloneGroup {
642                instances: vec![
643                    CloneInstance {
644                        file: "/a.ts".into(),
645                        start_line: 1,
646                        end_line: 5,
647                        start_col: 0,
648                        end_col: 10,
649                        fragment: "code".into(),
650                    },
651                    CloneInstance {
652                        file: "/b.ts".into(),
653                        start_line: 1,
654                        end_line: 5,
655                        start_col: 0,
656                        end_col: 10,
657                        fragment: "code".into(),
658                    },
659                ],
660                token_count: 20,
661                line_count: 5,
662            }],
663            clone_families: vec![],
664            mirrored_directories: vec![],
665            stats: DuplicationStats {
666                total_files: 2,
667                files_with_clones: 2,
668                total_lines: 100,
669                duplicated_lines: 10,
670                total_tokens: 200,
671                duplicated_tokens: 40,
672                clone_groups: 1,
673                clone_instances: 2,
674                duplication_percentage: 10.0,
675            },
676        };
677
678        let mut changed: FxHashSet<PathBuf> = FxHashSet::default();
679        changed.insert("/a.ts".into());
680
681        filter_duplication_by_changed_files(&mut report, &changed, Path::new(""));
682        assert_eq!(report.clone_groups.len(), 1);
683        // stats recomputed from surviving groups
684        assert_eq!(report.stats.clone_groups, 1);
685        assert_eq!(report.stats.clone_instances, 2);
686    }
687
688    // -----------------------------------------------------------------------
689    // Real git interactions (tempdir + git init). These exercise the
690    // path-resolution boundary between `git rev-parse --show-toplevel`,
691    // `git diff --name-only`, and `git ls-files --full-name --others` to
692    // catch regressions like issue #190 where the LSP workspace was a
693    // subdirectory of the git repo and changed-file paths were joined
694    // against the wrong base.
695    // -----------------------------------------------------------------------
696
697    /// Initialize a temp git repo with a single committed file plus a tag
698    /// at HEAD. Returns the canonical repo root.
699    fn init_repo(repo: &Path) -> PathBuf {
700        run_git(repo, &["init", "--quiet", "--initial-branch=main"]);
701        run_git(repo, &["config", "user.email", "test@example.com"]);
702        run_git(repo, &["config", "user.name", "test"]);
703        run_git(repo, &["config", "commit.gpgsign", "false"]);
704        std::fs::write(repo.join("seed.txt"), "seed\n").unwrap();
705        run_git(repo, &["add", "seed.txt"]);
706        run_git(repo, &["commit", "--quiet", "-m", "initial"]);
707        run_git(repo, &["tag", "fallow-baseline"]);
708        repo.canonicalize().unwrap()
709    }
710
711    fn run_git(cwd: &Path, args: &[&str]) {
712        let output = std::process::Command::new("git")
713            .args(args)
714            .current_dir(cwd)
715            .output()
716            .expect("git available");
717        assert!(
718            output.status.success(),
719            "git {args:?} failed: {}",
720            String::from_utf8_lossy(&output.stderr)
721        );
722    }
723
724    /// Workspace at git root, an untracked file is included in the
725    /// changed-files set with an absolute path joined from the repo root.
726    #[test]
727    fn try_get_changed_files_workspace_at_repo_root() {
728        let tmp = tempfile::tempdir().unwrap();
729        let repo = init_repo(tmp.path());
730        std::fs::create_dir_all(repo.join("src")).unwrap();
731        std::fs::write(repo.join("src/new.ts"), "export const x = 1;\n").unwrap();
732
733        let changed = try_get_changed_files(&repo, "fallow-baseline").unwrap();
734
735        let expected = repo.join("src/new.ts");
736        assert!(
737            changed.contains(&expected),
738            "changed set should contain {expected:?}; actual: {changed:?}"
739        );
740    }
741
742    /// Regression test for #190. When the workspace is a subdirectory of
743    /// the git repository, `git diff --name-only` emits paths relative to
744    /// the repo root (e.g., `frontend/src/new.ts`). Without the
745    /// rev-parse-based toplevel resolution the function joined those
746    /// against the workspace root, producing bogus paths like
747    /// `<repo>/frontend/frontend/src/new.ts` that never matched
748    /// `analyze_project` output and silently dropped the filter.
749    #[test]
750    fn try_get_changed_files_workspace_in_subdirectory() {
751        let tmp = tempfile::tempdir().unwrap();
752        let repo = init_repo(tmp.path());
753        let frontend = repo.join("frontend");
754        std::fs::create_dir_all(frontend.join("src")).unwrap();
755        std::fs::write(frontend.join("src/new.ts"), "export const x = 1;\n").unwrap();
756
757        let changed = try_get_changed_files(&frontend, "fallow-baseline").unwrap();
758
759        let expected = repo.join("frontend/src/new.ts");
760        assert!(
761            changed.contains(&expected),
762            "changed set should contain canonical {expected:?}; actual: {changed:?}"
763        );
764        // Verify the bogus double-frontend path is NOT in the set
765        let bogus = frontend.join("frontend/src/new.ts");
766        assert!(
767            !changed.contains(&bogus),
768            "changed set must not contain double-frontend path {bogus:?}"
769        );
770    }
771
772    /// A *committed* change in a sibling subdirectory (outside the
773    /// workspace) appears in the changed-files set because `git diff`
774    /// is repo-wide regardless of cwd. The downstream
775    /// `filter_results_by_changed_files` retains it only if
776    /// `analyze_project` saw it; for a workspace scoped to one subdir,
777    /// the sibling file is not in the analysis paths and falls away at
778    /// the result-merge boundary, not here. This test pins the contract:
779    /// for committed changes, the set is repo-wide.
780    ///
781    /// Note: `git ls-files --others --exclude-standard` only lists
782    /// untracked files in cwd's subtree, so untracked siblings are NOT
783    /// in the set when invoked from a subdirectory. That's harmless for
784    /// the LSP because `analyze_project` only walks files under the
785    /// workspace root either way.
786    #[test]
787    fn try_get_changed_files_includes_committed_sibling_changes() {
788        let tmp = tempfile::tempdir().unwrap();
789        let repo = init_repo(tmp.path());
790        let backend = repo.join("backend");
791        std::fs::create_dir_all(&backend).unwrap();
792        std::fs::write(backend.join("server.py"), "print('hi')\n").unwrap();
793        run_git(&repo, &["add", "."]);
794        run_git(&repo, &["commit", "--quiet", "-m", "add backend"]);
795
796        let frontend = repo.join("frontend");
797        std::fs::create_dir_all(&frontend).unwrap();
798
799        let changed = try_get_changed_files(&frontend, "fallow-baseline").unwrap();
800
801        let expected = repo.join("backend/server.py");
802        assert!(
803            changed.contains(&expected),
804            "committed sibling backend/server.py should be in the set: {changed:?}"
805        );
806    }
807
808    /// Modifying a tracked file shows up via `git diff --name-only HEAD`,
809    /// not just via `ls-files --others`. Confirm the path-join fix
810    /// applies to that codepath too.
811    #[test]
812    fn try_get_changed_files_includes_modified_tracked_file() {
813        let tmp = tempfile::tempdir().unwrap();
814        let repo = init_repo(tmp.path());
815        let frontend = repo.join("frontend");
816        std::fs::create_dir_all(frontend.join("src")).unwrap();
817        std::fs::write(frontend.join("src/old.ts"), "export const x = 1;\n").unwrap();
818        run_git(&repo, &["add", "."]);
819        run_git(&repo, &["commit", "--quiet", "-m", "add old"]);
820        run_git(&repo, &["tag", "fallow-baseline-v2"]);
821        // Modify the tracked file (no commit, so diff-HEAD picks it up)
822        std::fs::write(frontend.join("src/old.ts"), "export const x = 2;\n").unwrap();
823
824        let changed = try_get_changed_files(&frontend, "fallow-baseline-v2").unwrap();
825
826        let expected = repo.join("frontend/src/old.ts");
827        assert!(
828            changed.contains(&expected),
829            "modified tracked file {expected:?} missing from set: {changed:?}"
830        );
831    }
832
833    /// `resolve_git_toplevel` returns the canonical repo path even when
834    /// invoked from inside a subdirectory and via a symlinked input path.
835    /// On macOS this guards against the `/tmp` -> `/private/tmp`
836    /// canonicalization gap that would otherwise make the LSP filter set
837    /// disagree with `analyze_project` paths.
838    #[test]
839    fn resolve_git_toplevel_returns_canonical_path() {
840        let tmp = tempfile::tempdir().unwrap();
841        let repo = init_repo(tmp.path());
842        let frontend = repo.join("frontend");
843        std::fs::create_dir_all(&frontend).unwrap();
844
845        let toplevel = resolve_git_toplevel(&frontend).unwrap();
846        assert_eq!(toplevel, repo, "toplevel should equal canonical repo root");
847        assert_eq!(
848            toplevel,
849            toplevel.canonicalize().unwrap(),
850            "resolved toplevel should already be canonical"
851        );
852    }
853
854    /// Outside any git repo, `resolve_git_toplevel` returns
855    /// `NotARepository` rather than panicking or returning a wrong path.
856    /// The LSP relies on this to fall back to the workspace root cleanly.
857    #[test]
858    fn resolve_git_toplevel_not_a_repository() {
859        let tmp = tempfile::tempdir().unwrap();
860        let result = resolve_git_toplevel(tmp.path());
861        assert!(
862            matches!(result, Err(ChangedFilesError::NotARepository)),
863            "expected NotARepository, got {result:?}"
864        );
865    }
866
867    /// `try_get_changed_files` propagates the not-a-repo error so the
868    /// LSP can warn and fall back to full-scope results.
869    #[test]
870    fn try_get_changed_files_not_a_repository() {
871        let tmp = tempfile::tempdir().unwrap();
872        let result = try_get_changed_files(tmp.path(), "main");
873        assert!(matches!(result, Err(ChangedFilesError::NotARepository)));
874    }
875
876    #[test]
877    fn filter_duplication_drops_groups_with_no_changed_instance() {
878        let mut report = DuplicationReport {
879            clone_groups: vec![CloneGroup {
880                instances: vec![CloneInstance {
881                    file: "/a.ts".into(),
882                    start_line: 1,
883                    end_line: 5,
884                    start_col: 0,
885                    end_col: 10,
886                    fragment: "code".into(),
887                }],
888                token_count: 20,
889                line_count: 5,
890            }],
891            clone_families: vec![],
892            mirrored_directories: vec![],
893            stats: DuplicationStats {
894                total_files: 1,
895                files_with_clones: 1,
896                total_lines: 100,
897                duplicated_lines: 5,
898                total_tokens: 100,
899                duplicated_tokens: 20,
900                clone_groups: 1,
901                clone_instances: 1,
902                duplication_percentage: 5.0,
903            },
904        };
905
906        let changed: FxHashSet<PathBuf> = FxHashSet::default();
907        filter_duplication_by_changed_files(&mut report, &changed, Path::new(""));
908        assert!(report.clone_groups.is_empty());
909        assert_eq!(report.stats.clone_groups, 0);
910        assert_eq!(report.stats.clone_instances, 0);
911        assert!((report.stats.duplication_percentage - 0.0).abs() < f64::EPSILON);
912    }
913}