diff options
| -rw-r--r-- | Cargo.lock | 4 | ||||
| -rw-r--r-- | cli/Cargo.toml | 2 | ||||
| -rw-r--r-- | cli/fmt.rs | 2 | ||||
| -rw-r--r-- | cli/lint.rs | 60 | ||||
| -rw-r--r-- | cli/main.rs | 2 | ||||
| -rw-r--r-- | cli/tests/lint/expected.out | 28 | ||||
| -rw-r--r-- | cli/tests/lint/expected_glob.out | 2 |
7 files changed, 56 insertions, 44 deletions
diff --git a/Cargo.lock b/Cargo.lock index cdfd43d5c..9b1678db5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -506,9 +506,9 @@ dependencies = [ [[package]] name = "deno_lint" -version = "0.1.9" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "886dbbba1d26b726e4e6c4c03001b7f21b31384acb2a038e5bce430c42de4190" +checksum = "dc10bb331262fd598e6925ab8b59f72b01cc9c3a5a818ce7d57652e4b23fe45a" dependencies = [ "lazy_static", "regex", diff --git a/cli/Cargo.toml b/cli/Cargo.toml index f8ad6abb9..858732296 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -20,7 +20,7 @@ deno_typescript = { path = "../deno_typescript", version = "0.47.1" } [dependencies] deno_core = { path = "../core", version = "0.47.1" } -deno_lint = { version = "0.1.9" } +deno_lint = { version = "0.1.10" } deno_typescript = { path = "../deno_typescript", version = "0.47.1" } atty = "0.2.14" diff --git a/cli/fmt.rs b/cli/fmt.rs index 229039606..96ca285c1 100644 --- a/cli/fmt.rs +++ b/cli/fmt.rs @@ -264,7 +264,7 @@ fn write_file_contents( Ok(fs::write(file_path, file_text)?) } -async fn run_parallelized<F>( +pub async fn run_parallelized<F>( file_paths: Vec<PathBuf>, f: F, ) -> Result<(), ErrBox> diff --git a/cli/lint.rs b/cli/lint.rs index 5dfbcaf40..16d3c3021 100644 --- a/cli/lint.rs +++ b/cli/lint.rs @@ -10,6 +10,7 @@ use crate::colors; use crate::file_fetcher::map_file_extension; use crate::fmt::collect_files; +use crate::fmt::run_parallelized; use crate::fmt_errors; use crate::swc_util; use deno_core::ErrBox; @@ -18,36 +19,71 @@ use deno_lint::linter::Linter; use deno_lint::rules; use std::fs; use std::path::PathBuf; +use std::sync::atomic::{AtomicUsize, Ordering}; +use std::sync::{Arc, Mutex}; -pub fn lint_files(args: Vec<String>) -> Result<(), ErrBox> { +pub async fn lint_files(args: Vec<String>) -> Result<(), ErrBox> { let target_files = collect_files(args)?; + debug!("Found {} files", target_files.len()); - let mut error_counts = 0; + let error_count = Arc::new(AtomicUsize::new(0)); - for file_path in target_files { - let file_diagnostics = lint_file(file_path)?; - error_counts += file_diagnostics.len(); - for d in file_diagnostics.iter() { - let fmt_diagnostic = format_diagnostic(d); - eprintln!("{}\n", fmt_diagnostic); + // prevent threads outputting at the same time + let output_lock = Arc::new(Mutex::new(0)); + + run_parallelized(target_files, { + let error_count = error_count.clone(); + move |file_path| { + let r = lint_file(file_path.clone()); + + match r { + Ok(file_diagnostics) => { + error_count.fetch_add(file_diagnostics.len(), Ordering::SeqCst); + let _g = output_lock.lock().unwrap(); + for d in file_diagnostics.iter() { + let fmt_diagnostic = format_diagnostic(d); + eprintln!("{}\n", fmt_diagnostic); + } + } + Err(err) => { + eprintln!("Error linting: {}", file_path.to_string_lossy()); + eprintln!(" {}", err); + } + } + Ok(()) } - } + }) + .await?; - if error_counts > 0 { - eprintln!("Found {} problems", error_counts); + let error_count = error_count.load(Ordering::SeqCst); + if error_count > 0 { + eprintln!("Found {} problems", error_count); std::process::exit(1); } Ok(()) } +fn create_linter() -> Linter { + Linter::new( + "deno-lint-ignore-file".to_string(), + vec![ + "deno-lint-ignore".to_string(), + "eslint-disable-next-line".to_string(), + ], + // TODO(bartlomieju): switch to true, once + // https://github.com/denoland/deno_lint/issues/156 is fixed + false, + ) +} + fn lint_file(file_path: PathBuf) -> Result<Vec<LintDiagnostic>, ErrBox> { let file_name = file_path.to_string_lossy().to_string(); let source_code = fs::read_to_string(&file_path)?; let media_type = map_file_extension(&file_path); let syntax = swc_util::get_syntax_for_media_type(media_type); - let mut linter = Linter::default(); + let mut linter = create_linter(); let lint_rules = rules::get_recommended_rules(); let file_diagnostics = diff --git a/cli/main.rs b/cli/main.rs index 8e819927e..193a8df81 100644 --- a/cli/main.rs +++ b/cli/main.rs @@ -331,7 +331,7 @@ async fn lint_command(flags: Flags, files: Vec<String>) -> Result<(), ErrBox> { )?; state.check_unstable("lint"); - lint::lint_files(files) + lint::lint_files(files).await } async fn cache_command(flags: Flags, files: Vec<String>) -> Result<(), ErrBox> { diff --git a/cli/tests/lint/expected.out b/cli/tests/lint/expected.out index 57af15971..a85c90859 100644 --- a/cli/tests/lint/expected.out +++ b/cli/tests/lint/expected.out @@ -1,26 +1,2 @@ -(ban-untagged-ignore) Ignore directive requires lint rule code -// deno-lint-ignore -~~~~~~~~~~~~~~~~~~~ - at [WILDCARD]file1.js:1:0 - -(no-empty) Empty block statement -while (false) {} - ~~ - at [WILDCARD]file1.js:2:14 - -(no-empty) Empty block statement -} catch (e) {} - ~~ - at [WILDCARD]file2.ts:3:12 - -(ban-unused-ignore) Ignore for code "require-await" was not used. -// deno-lint-ignore no-explicit-any require-await -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - at [WILDCARD]file2.ts:5:0 - -(no-empty-function) Empty functions are not allowed -function foo(): any {} -~~~~~~~~~~~~~~~~~~~~~~ - at [WILDCARD]file2.ts:6:0 - -Found 5 problems +[WILDCARD] +Found 3 problems diff --git a/cli/tests/lint/expected_glob.out b/cli/tests/lint/expected_glob.out index 3e3ebd649..a85c90859 100644 --- a/cli/tests/lint/expected_glob.out +++ b/cli/tests/lint/expected_glob.out @@ -1,2 +1,2 @@ [WILDCARD] -Found 5 problems +Found 3 problems |