diff options
author | Zheyu Zhang <zheyuzhang03@gmail.com> | 2021-11-04 23:12:12 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-11-04 11:12:12 -0400 |
commit | efe956b4fd51818e3a982b9d7c4111c408d07291 (patch) | |
tree | 9e3bf26c021758e962473468a7e954fc9cb63937 /cli/flags.rs | |
parent | 318dcc33afd510c02984d4d3527c88bf4383bcf1 (diff) |
fix(lint): use recommended tag if there is no tags in config file or flags (#12644)
Diffstat (limited to 'cli/flags.rs')
-rw-r--r-- | cli/flags.rs | 72 |
1 files changed, 36 insertions, 36 deletions
diff --git a/cli/flags.rs b/cli/flags.rs index 67c76244d..3edd2f0db 100644 --- a/cli/flags.rs +++ b/cli/flags.rs @@ -121,9 +121,9 @@ pub struct LintFlags { pub files: Vec<PathBuf>, pub ignore: Vec<PathBuf>, pub rules: bool, - pub rules_tags: Vec<String>, - pub rules_include: Vec<String>, - pub rules_exclude: Vec<String>, + pub maybe_rules_tags: Option<Vec<String>>, + pub maybe_rules_include: Option<Vec<String>>, + pub maybe_rules_exclude: Option<Vec<String>>, pub json: bool, } @@ -1976,25 +1976,25 @@ fn lint_parse(flags: &mut Flags, matches: &clap::ArgMatches) { None => vec![], }; let rules = matches.is_present("rules"); - let rules_tags = match matches.values_of("rules-tags") { - Some(f) => f.map(String::from).collect(), - None => vec![], - }; - let rules_include = match matches.values_of("rules-include") { - Some(f) => f.map(String::from).collect(), - None => vec![], - }; - let rules_exclude = match matches.values_of("rules-exclude") { - Some(f) => f.map(String::from).collect(), - None => vec![], - }; + let maybe_rules_tags = matches + .values_of("rules-tags") + .map(|f| f.map(String::from).collect()); + + let maybe_rules_include = matches + .values_of("rules-include") + .map(|f| f.map(String::from).collect()); + + let maybe_rules_exclude = matches + .values_of("rules-exclude") + .map(|f| f.map(String::from).collect()); + let json = matches.is_present("json"); flags.subcommand = DenoSubcommand::Lint(LintFlags { files, rules, - rules_tags, - rules_include, - rules_exclude, + maybe_rules_tags, + maybe_rules_include, + maybe_rules_exclude, ignore, json, }); @@ -2826,9 +2826,9 @@ mod tests { PathBuf::from("script_2.ts") ], rules: false, - rules_tags: vec![], - rules_include: vec![], - rules_exclude: vec![], + maybe_rules_tags: None, + maybe_rules_include: None, + maybe_rules_exclude: None, json: false, ignore: vec![], }), @@ -2844,9 +2844,9 @@ mod tests { subcommand: DenoSubcommand::Lint(LintFlags { files: vec![], rules: false, - rules_tags: vec![], - rules_include: vec![], - rules_exclude: vec![], + maybe_rules_tags: None, + maybe_rules_include: None, + maybe_rules_exclude: None, json: false, ignore: vec![ PathBuf::from("script_1.ts"), @@ -2864,9 +2864,9 @@ mod tests { subcommand: DenoSubcommand::Lint(LintFlags { files: vec![], rules: true, - rules_tags: vec![], - rules_include: vec![], - rules_exclude: vec![], + maybe_rules_tags: None, + maybe_rules_include: None, + maybe_rules_exclude: None, json: false, ignore: vec![], }), @@ -2887,9 +2887,9 @@ mod tests { subcommand: DenoSubcommand::Lint(LintFlags { files: vec![], rules: false, - rules_tags: svec![""], - rules_include: svec!["ban-untagged-todo", "no-undef"], - rules_exclude: svec!["no-const-assign"], + maybe_rules_tags: Some(svec![""]), + maybe_rules_include: Some(svec!["ban-untagged-todo", "no-undef"]), + maybe_rules_exclude: Some(svec!["no-const-assign"]), json: false, ignore: vec![], }), @@ -2904,9 +2904,9 @@ mod tests { subcommand: DenoSubcommand::Lint(LintFlags { files: vec![PathBuf::from("script_1.ts")], rules: false, - rules_tags: vec![], - rules_include: vec![], - rules_exclude: vec![], + maybe_rules_tags: None, + maybe_rules_include: None, + maybe_rules_exclude: None, json: true, ignore: vec![], }), @@ -2928,9 +2928,9 @@ mod tests { subcommand: DenoSubcommand::Lint(LintFlags { files: vec![PathBuf::from("script_1.ts")], rules: false, - rules_tags: vec![], - rules_include: vec![], - rules_exclude: vec![], + maybe_rules_tags: None, + maybe_rules_include: None, + maybe_rules_exclude: None, json: true, ignore: vec![], }), |