diff options
| -rw-r--r-- | cli/flags.rs | 25 | ||||
| -rw-r--r-- | cli/main.rs | 6 | ||||
| -rw-r--r-- | cli/tests/integration_tests.rs | 16 | ||||
| -rw-r--r-- | docs/tools/linter.md | 13 |
4 files changed, 21 insertions, 39 deletions
diff --git a/cli/flags.rs b/cli/flags.rs index e0eae867c..59bcb5cd0 100644 --- a/cli/flags.rs +++ b/cli/flags.rs @@ -988,18 +988,18 @@ fn lint_subcommand<'a, 'b>() -> App<'a, 'b> { .about("Lint source files") .long_about( "Lint JavaScript/TypeScript source code. - deno lint --unstable - deno lint --unstable myfile1.ts myfile2.js + deno lint + deno lint myfile1.ts myfile2.js Print result as JSON: deno lint --unstable --json Read from stdin: - cat file.ts | deno lint --unstable - + cat file.ts | deno lint - cat file.ts | deno lint --unstable --json - List available rules: - deno lint --unstable --rules + deno lint --rules Ignore diagnostics on the next line by preceding it with an ignore comment and rule name: @@ -1024,7 +1024,6 @@ Ignore linting a file by adding an ignore comment at the top of the file: .arg( Arg::with_name("ignore") .long("ignore") - .requires("unstable") .takes_value(true) .use_delimiter(true) .require_equals(true) @@ -1034,6 +1033,7 @@ Ignore linting a file by adding an ignore comment at the top of the file: Arg::with_name("json") .long("json") .help("Output lint result in JSON format") + .requires("unstable") .takes_value(false), ) .arg( @@ -1818,13 +1818,8 @@ mod tests { #[test] fn lint() { - let r = flags_from_vec_safe(svec![ - "deno", - "lint", - "--unstable", - "script_1.ts", - "script_2.ts" - ]); + let r = + flags_from_vec_safe(svec!["deno", "lint", "script_1.ts", "script_2.ts"]); assert_eq!( r.unwrap(), Flags { @@ -1837,7 +1832,6 @@ mod tests { json: false, ignore: vec![], }, - unstable: true, ..Flags::default() } ); @@ -1845,7 +1839,6 @@ mod tests { let r = flags_from_vec_safe(svec![ "deno", "lint", - "--unstable", "--ignore=script_1.ts,script_2.ts" ]); assert_eq!( @@ -1860,12 +1853,11 @@ mod tests { PathBuf::from("script_2.ts") ], }, - unstable: true, ..Flags::default() } ); - let r = flags_from_vec_safe(svec!["deno", "lint", "--unstable", "--rules"]); + let r = flags_from_vec_safe(svec!["deno", "lint", "--rules"]); assert_eq!( r.unwrap(), Flags { @@ -1875,7 +1867,6 @@ mod tests { json: false, ignore: vec![], }, - unstable: true, ..Flags::default() } ); diff --git a/cli/main.rs b/cli/main.rs index 9080bc6cb..56e3c19f8 100644 --- a/cli/main.rs +++ b/cli/main.rs @@ -216,16 +216,12 @@ async fn install_command( } async fn lint_command( - flags: Flags, + _flags: Flags, files: Vec<PathBuf>, list_rules: bool, ignore: Vec<PathBuf>, json: bool, ) -> Result<(), AnyError> { - if !flags.unstable { - exit_unstable("lint"); - } - if list_rules { lint::print_rules_list(); return Ok(()); diff --git a/cli/tests/integration_tests.rs b/cli/tests/integration_tests.rs index 26772338c..047440a70 100644 --- a/cli/tests/integration_tests.rs +++ b/cli/tests/integration_tests.rs @@ -33,7 +33,6 @@ fn std_tests() { fn std_lint() { let status = util::deno_cmd() .arg("lint") - .arg("--unstable") .arg(format!( "--ignore={}", util::root_path().join("std/node/tests").to_string_lossy() @@ -2823,13 +2822,13 @@ itest!(deno_test_coverage { }); itest!(deno_lint { - args: "lint --unstable lint/file1.js lint/file2.ts lint/ignored_file.ts", + args: "lint lint/file1.js lint/file2.ts lint/ignored_file.ts", output: "lint/expected.out", exit_code: 1, }); itest!(deno_lint_quiet { - args: "lint --unstable --quiet lint/file1.js", + args: "lint --quiet lint/file1.js", output: "lint/expected_quiet.out", exit_code: 1, }); @@ -2842,19 +2841,19 @@ itest!(deno_lint_json { }); itest!(deno_lint_ignore { - args: "lint --unstable --ignore=lint/file1.js,lint/malformed.js lint/", + args: "lint --ignore=lint/file1.js,lint/malformed.js lint/", output: "lint/expected_ignore.out", exit_code: 1, }); itest!(deno_lint_glob { - args: "lint --unstable --ignore=lint/malformed.js lint/", + args: "lint --ignore=lint/malformed.js lint/", output: "lint/expected_glob.out", exit_code: 1, }); itest!(deno_lint_from_stdin { - args: "lint --unstable -", + args: "lint -", input: Some("let a: any;"), output: "lint/expected_from_stdin.out", exit_code: 1, @@ -2868,14 +2867,14 @@ itest!(deno_lint_from_stdin_json { }); itest!(deno_lint_rules { - args: "lint --unstable --rules", + args: "lint --rules", output: "lint/expected_rules.out", exit_code: 0, }); // Make sure that the rules are printed if quiet option is enabled. itest!(deno_lint_rules_quiet { - args: "lint --unstable --rules -q", + args: "lint --rules -q", output: "lint/expected_rules.out", exit_code: 0, }); @@ -4036,7 +4035,6 @@ fn lint_ignore_unexplicit_files() { let output = util::deno_cmd() .current_dir(util::root_path()) .arg("lint") - .arg("--unstable") .arg("--ignore=./") .stderr(std::process::Stdio::piped()) .spawn() diff --git a/docs/tools/linter.md b/docs/tools/linter.md index b5646d71d..fffff0cb2 100644 --- a/docs/tools/linter.md +++ b/docs/tools/linter.md @@ -2,18 +2,15 @@ Deno ships with a built in code linter for JavaScript and TypeScript. -**Note: linter is a new feature and still unstable thus it requires `--unstable` -flag** - ```shell # lint all JS/TS files in the current directory and subdirectories -deno lint --unstable +deno lint # lint specific files -deno lint --unstable myfile1.ts myfile2.ts -# print result as JSON -deno lint --unstable --json +deno lint myfile1.ts myfile2.ts # read from stdin -cat file.ts | deno lint --unstable - +cat file.ts | deno lint - +# print result as JSON (output is subject to change hence --unstable flag) +deno lint --unstable --json ``` For more detail, run `deno lint --help`. |