Skip to content
Merged
Changes from all commits
Commits
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
41 changes: 32 additions & 9 deletions cli/plan/src/reports/planning.rs
Original file line number Diff line number Diff line change
Expand Up @@ -117,16 +117,37 @@ fn identity_key(resolved: &Path) -> PathBuf {
} else {
resolved.to_path_buf()
};
#[cfg(windows)]
{
PathBuf::from(anchored.to_string_lossy().to_lowercase())
}
#[cfg(not(windows))]
{
let (Some(parent), Some(name)) = (anchored.parent(), anchored.file_name()) else {
return anchored;
};
if directory_ignores_case(parent) {
parent.join(name.to_string_lossy().to_lowercase())
} else {
anchored
}
}

fn directory_ignores_case(dir: &Path) -> bool {
probe_case_insensitive(dir).unwrap_or(cfg!(any(windows, target_os = "macos")))
}

fn probe_case_insensitive(dir: &Path) -> std::io::Result<bool> {
let lower = format!(".dx-case-probe-{}-{}", std::process::id(), probe_counter());
let probe = dir.join(&lower);
std::fs::OpenOptions::new()
.write(true)
.create_new(true)
.open(&probe)?;
let found = dir.join(lower.to_uppercase()).exists();
let _ = std::fs::remove_file(&probe);
Ok(found)
}

fn probe_counter() -> u64 {
static COUNTER: std::sync::atomic::AtomicU64 = std::sync::atomic::AtomicU64::new(0);
COUNTER.fetch_add(1, std::sync::atomic::Ordering::Relaxed)
}

fn stdout_conflict(error: OutputError) -> ReportError {
match error {
OutputError::SecondStdoutReport => ReportError::MultipleStdoutReports,
Expand Down Expand Up @@ -729,18 +750,20 @@ mod tests {
}

#[test]
fn planning_treats_case_variants_per_platform() {
fn planning_treats_case_variants_by_directory_case_sensitivity() {
let workspace = workspace();
let result = plan_reports(
workspace.path(),
Command::Lint,
&requests(&[("sarif", "out.sarif"), ("sarif", "OUT.sarif")]),
&text_mode(),
);
if cfg!(windows) {
let ignores_case =
directory_ignores_case(&std::fs::canonicalize(workspace.path()).unwrap());
if ignores_case {
assert!(
matches!(result, Err(ReportError::ConflictingReports { .. })),
"case variants collide on Windows"
"case variants collide on a case-insensitive directory"
);
} else {
assert!(result.is_ok(), "case variants stay distinct here");
Expand Down
Loading