Update CLI to respect fix applicability

crates/ruff_cli/src/args.rs

@@ -76,11 +76,14 @@ pub enum Command {
 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.
+    /// Apply automatic fixes to resolve lint violations.
+    /// Use `--no-fix` to disable or `--fix-suggested` to include suggested fixes.
     #[arg(long, overrides_with("no_fix"))]
     fix: bool,
-    #[clap(long, overrides_with("fix"), hide = true)]
+    /// Apply automatic and suggested fixes to resolve 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.
@@ -100,8 +103,8 @@ pub struct CheckCommand {
     /// Run in watch mode by re-running whenever files change.
     #[arg(short, long)]
     pub watch: bool,
-    /// Fix any fixable lint violations, but don't report on leftover violations. Implies `--fix`.
-    /// Use `--no-fix-only` to disable.
+    /// Apply fixes to resolve lint violations, but don't report on leftover violations. Implies `--fix`.
+    /// Use `--no-fix-only` to disable or `--fix-suggested` to include suggested fixes.
     #[arg(long, overrides_with("no_fix_only"))]
     fix_only: bool,
     #[clap(long, overrides_with("fix_only"), hide = true)]
@@ -497,6 +500,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 +603,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 +629,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.lint.rule_selections.push(RuleSelection {
             select: self.select.clone(),
             ignore: self

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),
             )
         }
     }

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();

crates/ruff_cli/src/commands/check_stdin.rs

@@ -30,7 +30,7 @@ pub(crate) fn check_stdin(
     let mut diagnostics = lint_stdin(
         filename,
         package_root,
-        stdin,
+        &stdin,
         &pyproject_config.settings,
         noqa,
         fix_mode,