Skip to content

test(oxlint): fix InvalidOptionTsConfig tests for windows #8791

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

Merged
Boshen merged 6 commits into from
Jan 31, 2025
Merged

test(oxlint): fix InvalidOptionTsConfig tests for windows #8791

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
992b81e
refactor(language_server): simplify IsolatedLintHandler
Sysix Dec 29, 2024
540c038
Merge branch 'main' of https://github.com/oxc-project/oxc
Jan 9, 2025
5b09c74
Merge branch 'main' of https://github.com/oxc-project/oxc
Sysix Jan 26, 2025
75a5b79
Merge branch 'main' of https://github.com/oxc-project/oxc
Sysix Jan 29, 2025
3702288
Merge branch 'main' of https://github.com/oxc-project/oxc
Sysix Jan 30, 2025
e14cfd6
test(linter): fix InvalidOptionTsConfig tests for windows
Sysix Jan 30, 2025
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 change: 1 addition & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions apps/oxlint/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ oxc_linter = { workspace = true }
oxc_span = { workspace = true }

bpaf = { workspace = true, features = ["autocomplete", "bright-color", "derive"] }
cow-utils = { workspace = true }
ignore = { workspace = true, features = ["simd-accel"] }
miette = { workspace = true }
rayon = { workspace = true }
Expand Down
4 changes: 3 additions & 1 deletion apps/oxlint/src/lint.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ use std::{
time::Instant,
};

use cow_utils::CowUtils;
use ignore::gitignore::Gitignore;
use oxc_diagnostics::{DiagnosticService, GraphicalReportHandler};
use oxc_linter::{
Expand Down Expand Up @@ -209,7 +210,8 @@ impl Runner for LintRunner {
} else {
let path = if path.is_relative() { options.cwd().join(path) } else { path.clone() };
stdout.write_all(format!(
"The tsconfig file {path:?} does not exist, Please provide a valid tsconfig file.\n",
"The tsconfig file {:?} does not exist, Please provide a valid tsconfig file.\n",
path.to_string_lossy().cow_replace('\\', "/")
).as_bytes()).or_else(Self::check_for_writer_error).unwrap();
stdout.flush().unwrap();

Expand Down
11 changes: 5 additions & 6 deletions apps/oxlint/src/tester.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ use crate::cli::{lint_command, LintRunner};
#[cfg(test)]
use crate::runner::Runner;
#[cfg(test)]
use cow_utils::CowUtils;
#[cfg(test)]
use regex::Regex;
#[cfg(test)]
use std::{env, path::PathBuf};
Expand Down Expand Up @@ -78,10 +80,8 @@ impl Tester {

// do not output the current working directory, each machine has a different one
let cwd_string = current_cwd.to_str().unwrap();
#[allow(clippy::disallowed_methods)]
let cwd_string = cwd_string.replace('\\', "/");
#[allow(clippy::disallowed_methods)]
let output_string = output_string.replace(&cwd_string, "<cwd>");
let cwd_string = cwd_string.cow_replace('\\', "/").to_string(); // for windows
let output_string = output_string.cow_replace(&cwd_string, "<cwd>");

let full_args_list =
multiple_args.iter().map(|args| args.join(" ")).collect::<Vec<String>>().join(" ");
Expand All @@ -90,8 +90,7 @@ impl Tester {

// windows can not handle filenames with *
// allow replace instead of cow_replace. It only test
#[allow(clippy::disallowed_methods)]
let snapshot_file_name = snapshot_file_name.replace('*', "_");
let snapshot_file_name = snapshot_file_name.cow_replace('*', "_").to_string();
settings.bind(|| {
insta::assert_snapshot!(snapshot_file_name, output_string);
});
Expand Down