Have CLI repsect rule applicability when fixing

astral-sh · Sep 24, 2023 · 93cc501 · 93cc501
1 parent 1a22eae
commit 93cc501
Show file tree

Hide file tree

Showing 18 changed files with 586 additions and 200 deletions.
diff --git a/crates/ruff_cli/src/args.rs b/crates/ruff_cli/src/args.rs
@@ -72,15 +72,17 @@ pub enum Command {
 
 // The `Parser` derive is for ruff_dev, for ruff_cli `Args` would be sufficient
 #[derive(Clone, Debug, clap::Parser)]
-#[allow(clippy::struct_excessive_bools)]
 pub struct CheckCommand {
     /// List of files or directories to check.
     pub files: Vec<PathBuf>,
     /// Attempt to automatically fix lint violations.
     /// Use `--no-fix` to disable.
     #[arg(long, overrides_with("no_fix"))]
     fix: bool,
-    #[clap(long, overrides_with("fix"), hide = true)]
+    /// Attempt to automatically fix both automatic and suggested lint violations.
+    #[arg(long, overrides_with_all(["fix", "no_fix"]))]
+    fix_suggested: bool,
+    #[clap(long, overrides_with_all(["fix", "fix_suggested"]), hide = true)]
     no_fix: bool,
     /// Show violations with source code.
     /// Use `--no-show-source` to disable.
@@ -497,6 +499,7 @@ impl CheckCommand {
                 cache_dir: self.cache_dir,
                 fix: resolve_bool_arg(self.fix, self.no_fix),
                 fix_only: resolve_bool_arg(self.fix_only, self.no_fix_only),
+                fix_suggested: Some(self.fix_suggested),
                 force_exclude: resolve_bool_arg(self.force_exclude, self.no_force_exclude),
                 output_format: self.output_format.or(self.format),
                 show_fixes: resolve_bool_arg(self.show_fixes, self.no_show_fixes),
@@ -599,6 +602,7 @@ pub struct CliOverrides {
     pub cache_dir: Option<PathBuf>,
     pub fix: Option<bool>,
     pub fix_only: Option<bool>,
+    pub fix_suggested: Option<bool>,
     pub force_exclude: Option<bool>,
     pub output_format: Option<SerializationFormat>,
     pub show_fixes: Option<bool>,
@@ -624,6 +628,9 @@ impl ConfigurationTransformer for CliOverrides {
         if let Some(fix_only) = &self.fix_only {
             config.fix_only = Some(*fix_only);
         }
+        if self.fix_suggested.is_some() {
+            config.fix_suggested = self.fix_suggested;
+        }
         config.rule_selections.push(RuleSelection {
             select: self.select.clone(),
             ignore: self

diff --git a/crates/ruff_cli/src/cache.rs b/crates/ruff_cli/src/cache.rs
@@ -409,7 +409,7 @@ mod tests {
                     &settings.linter,
                     Some(&cache),
                     flags::Noqa::Enabled,
-                    flags::FixMode::Generate,
+                    flags::FixMode::Generate(flags::SuggestedFixes::Apply),
                 )
                 .unwrap();
                 if diagnostics
@@ -454,7 +454,7 @@ mod tests {
                 &settings.linter,
                 Some(&cache),
                 flags::Noqa::Enabled,
-                flags::FixMode::Generate,
+                flags::FixMode::Generate(flags::SuggestedFixes::Apply),
             )
             .unwrap();
         }
@@ -711,7 +711,7 @@ mod tests {
                 &self.settings.linter,
                 Some(cache),
                 flags::Noqa::Enabled,
-                flags::FixMode::Generate,
+                flags::FixMode::Generate(flags::SuggestedFixes::Apply),
             )
         }
     }

diff --git a/crates/ruff_cli/src/commands/check.rs b/crates/ruff_cli/src/commands/check.rs
@@ -284,7 +284,7 @@ mod test {
             &CliOverrides::default(),
             flags::Cache::Disabled,
             flags::Noqa::Disabled,
-            flags::FixMode::Generate,
+            flags::FixMode::Generate(flags::SuggestedFixes::Apply),
         )
         .unwrap();
         let mut output = Vec::new();