From a1d24fc353ffe1e20ee17da4e9f4db640486b2c2 Mon Sep 17 00:00:00 2001
From: Emanuele Stoppa <my.burning@gmail.com>
Date: Tue, 7 Mar 2023 09:41:28 +0000
Subject: [PATCH 1/4] fix(rome_cli): exit with error code while applying fixes

---
 crates/rome_cli/src/diagnostics.rs            | 59 +++++++++++++++++--
 crates/rome_cli/src/traversal.rs              |  8 ++-
 .../main_commands_check/apply_noop.snap       |  8 +++
 .../main_commands_check/apply_ok.snap         |  8 +++
 .../should_disable_a_rule_group.snap          |  8 +++
 .../src/file_handlers/javascript.rs           | 16 ++++-
 crates/rome_service/src/file_handlers/mod.rs  | 23 +++++++-
 crates/rome_service/src/workspace.rs          |  3 +
 8 files changed, 125 insertions(+), 8 deletions(-)

diff --git a/crates/rome_cli/src/diagnostics.rs b/crates/rome_cli/src/diagnostics.rs
index 8527188653c..8d6d1bb2b32 100644
--- a/crates/rome_cli/src/diagnostics.rs
+++ b/crates/rome_cli/src/diagnostics.rs
@@ -1,4 +1,4 @@
-use rome_console::fmt::Formatter;
+use rome_console::fmt::{Display, Formatter};
 use rome_console::markup;
 use rome_diagnostics::adapters::{IoError, PicoArgsError};
 use rome_diagnostics::{
@@ -147,9 +147,49 @@ pub struct IncompatibleArguments {
 #[diagnostic(
     category = "internalError/io",
     severity = Error,
-    message = "Some errors were emitted while running checks"
+    message(
+        description = "{action_kind}",
+        message({{self.action_kind}})
+    )
 )]
-pub struct CheckError;
+pub struct CheckError {
+    action_kind: CheckActionKind,
+}
+
+#[derive(Debug, Clone, Copy)]
+pub enum CheckActionKind {
+    Check,
+    Apply,
+}
+
+impl Display for CheckActionKind {
+    fn fmt(&self, fmt: &mut Formatter) -> std::io::Result<()> {
+        match self {
+            CheckActionKind::Check => fmt.write_markup(markup! {
+                "Some errors were emitted while "<Emphasis>"running checks"</Emphasis>
+            }),
+            CheckActionKind::Apply => fmt.write_markup(markup! {
+                <Emphasis>"Fixes applied"</Emphasis>", but there are still diagnostics to be addressed"
+            }),
+        }
+    }
+}
+
+impl std::fmt::Display for CheckActionKind {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            CheckActionKind::Check => {
+                write!(f, "Some errors were emitted while running checks")
+            }
+            CheckActionKind::Apply => {
+                write!(
+                    f,
+                    "Fixes applied but there are still diagnostics to be addressed"
+                )
+            }
+        }
+    }
+}
 
 #[derive(Debug, Diagnostic)]
 #[diagnostic(
@@ -300,9 +340,18 @@ impl CliDiagnostic {
         })
     }
 
-    /// Emitted when errors were emitted while traversing the file system
+    /// Emitted when errors were emitted while running `check` command
     pub fn check_error() -> Self {
-        Self::CheckError(CheckError)
+        Self::CheckError(CheckError {
+            action_kind: CheckActionKind::Check,
+        })
+    }
+
+    /// Emitted when errors were emitted while apply code fixes
+    pub fn apply_error() -> Self {
+        Self::CheckError(CheckError {
+            action_kind: CheckActionKind::Apply,
+        })
     }
 
     /// Emitted when the server is not running
diff --git a/crates/rome_cli/src/traversal.rs b/crates/rome_cli/src/traversal.rs
index e9b370899ca..444847eb24f 100644
--- a/crates/rome_cli/src/traversal.rs
+++ b/crates/rome_cli/src/traversal.rs
@@ -825,7 +825,13 @@ fn process_file(ctx: &TraversalOptions, path: &Path) -> FileResult {
                     .with_file_path(path.display().to_string())?;
             }
 
-            return Ok(FileStatus::Success);
+            return if fixed.errors == 0 {
+                Ok(FileStatus::Success)
+            } else {
+                Ok(FileStatus::Message(Message::Error(
+                    CliDiagnostic::apply_error().into(),
+                )))
+            };
         }
 
         let categories = if ctx.execution.is_format() || supported_lint.reason.is_some() {
diff --git a/crates/rome_cli/tests/snapshots/main_commands_check/apply_noop.snap b/crates/rome_cli/tests/snapshots/main_commands_check/apply_noop.snap
index f9ba2ba534a..08a8eeb66d5 100644
--- a/crates/rome_cli/tests/snapshots/main_commands_check/apply_noop.snap
+++ b/crates/rome_cli/tests/snapshots/main_commands_check/apply_noop.snap
@@ -12,6 +12,14 @@ if(a != 0) {}
 
 # Emitted Messages
 
+```block
+internalError/io ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+
+  × Fixes applied, but there are still diagnostics to be addressed
+  
+
+```
+
 ```block
 Skipped 1 suggested fixes.
 If you wish to apply the suggested (unsafe) fixes, use the command rome check --apply-unsafe
diff --git a/crates/rome_cli/tests/snapshots/main_commands_check/apply_ok.snap b/crates/rome_cli/tests/snapshots/main_commands_check/apply_ok.snap
index f9ba2ba534a..08a8eeb66d5 100644
--- a/crates/rome_cli/tests/snapshots/main_commands_check/apply_ok.snap
+++ b/crates/rome_cli/tests/snapshots/main_commands_check/apply_ok.snap
@@ -12,6 +12,14 @@ if(a != 0) {}
 
 # Emitted Messages
 
+```block
+internalError/io ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+
+  × Fixes applied, but there are still diagnostics to be addressed
+  
+
+```
+
 ```block
 Skipped 1 suggested fixes.
 If you wish to apply the suggested (unsafe) fixes, use the command rome check --apply-unsafe
diff --git a/crates/rome_cli/tests/snapshots/main_commands_check/should_disable_a_rule_group.snap b/crates/rome_cli/tests/snapshots/main_commands_check/should_disable_a_rule_group.snap
index 8b17cd83dd7..01c0283960f 100644
--- a/crates/rome_cli/tests/snapshots/main_commands_check/should_disable_a_rule_group.snap
+++ b/crates/rome_cli/tests/snapshots/main_commands_check/should_disable_a_rule_group.snap
@@ -30,6 +30,14 @@ try {
 
 # Emitted Messages
 
+```block
+internalError/io ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+
+  × Fixes applied, but there are still diagnostics to be addressed
+  
+
+```
+
 ```block
 Fixed 1 file(s) in <TIME>
 ```
diff --git a/crates/rome_service/src/file_handlers/javascript.rs b/crates/rome_service/src/file_handlers/javascript.rs
index 9b4cd39499f..6cd9c924aba 100644
--- a/crates/rome_service/src/file_handlers/javascript.rs
+++ b/crates/rome_service/src/file_handlers/javascript.rs
@@ -3,7 +3,7 @@ use super::{
     LintResults, Mime, ParserCapabilities,
 };
 use crate::configuration::to_analyzer_configuration;
-use crate::file_handlers::{FixAllParams, Language as LanguageId};
+use crate::file_handlers::{is_diagnostic_error, FixAllParams, Language as LanguageId};
 use crate::{
     settings::{FormatSettings, Language, LanguageSettings, LanguagesSettings, SettingsHandle},
     workspace::{
@@ -391,20 +391,32 @@ fn fix_all(params: FixAllParams) -> Result<FixFileResult, WorkspaceError> {
     };
 
     let mut skipped_suggested_fixes = 0;
+    let mut errors = 0;
     let analyzer_options = compute_analyzer_options(&settings);
     loop {
         let (action, _) = analyze(&tree, filter, &analyzer_options, |signal| {
+            let current_diagnostic = signal.diagnostic();
+
+            // all rules have at least an action, which is he suppression
+            if let Some(diagnostic) = current_diagnostic.as_ref() {
+                if is_diagnostic_error(diagnostic, params.rules) {
+                    errors += 1;
+                }
+            }
+
             for action in signal.actions() {
                 // suppression actions should not be part of the fixes (safe or suggested)
                 if action.is_suppression() {
                     continue;
                 }
+
                 match fix_file_mode {
                     FixFileMode::SafeFixes => {
                         if action.applicability == Applicability::MaybeIncorrect {
                             skipped_suggested_fixes += 1;
                         }
                         if action.applicability == Applicability::Always {
+                            errors -= 1;
                             return ControlFlow::Break(action);
                         }
                     }
@@ -413,6 +425,7 @@ fn fix_all(params: FixAllParams) -> Result<FixFileResult, WorkspaceError> {
                             action.applicability,
                             Applicability::Always | Applicability::MaybeIncorrect
                         ) {
+                            errors -= 1;
                             return ControlFlow::Break(action);
                         }
                     }
@@ -450,6 +463,7 @@ fn fix_all(params: FixAllParams) -> Result<FixFileResult, WorkspaceError> {
                     code: tree.syntax().to_string(),
                     skipped_suggested_fixes,
                     actions,
+                    errors,
                 });
             }
         }
diff --git a/crates/rome_service/src/file_handlers/mod.rs b/crates/rome_service/src/file_handlers/mod.rs
index c5b2fe7d83b..3815174d6c1 100644
--- a/crates/rome_service/src/file_handlers/mod.rs
+++ b/crates/rome_service/src/file_handlers/mod.rs
@@ -6,9 +6,10 @@ use crate::{
     Rules, WorkspaceError,
 };
 pub use javascript::JsFormatterSettings;
-use rome_analyze::AnalysisFilter;
+use rome_analyze::{AnalysisFilter, AnalyzerDiagnostic};
 use rome_console::fmt::Formatter;
 use rome_console::markup;
+use rome_diagnostics::{Diagnostic, Severity};
 use rome_formatter::Printed;
 use rome_fs::RomePath;
 use rome_js_syntax::{TextRange, TextSize};
@@ -292,3 +293,23 @@ impl Features {
         }
     }
 }
+
+/// Checks whether a diagnostic coming from the analyzer is an [error](Severity::Error)
+///
+/// The function checks the diagnostic against the current configured rules.
+pub(crate) fn is_diagnostic_error(
+    diagnostic: &'_ AnalyzerDiagnostic,
+    rules: Option<&'_ Rules>,
+) -> bool {
+    let severity = diagnostic
+        .category()
+        .filter(|category| category.name().starts_with("lint/"))
+        .map(|category| {
+            rules
+                .and_then(|rules| rules.get_severity_from_code(category))
+                .unwrap_or(Severity::Warning)
+        })
+        .unwrap_or_else(|| diagnostic.severity());
+
+    severity >= Severity::Error
+}
diff --git a/crates/rome_service/src/workspace.rs b/crates/rome_service/src/workspace.rs
index a714a922bab..8303661cc34 100644
--- a/crates/rome_service/src/workspace.rs
+++ b/crates/rome_service/src/workspace.rs
@@ -254,6 +254,9 @@ pub struct FixFileResult {
     /// List of all the code actions applied to the file
     pub actions: Vec<FixAction>,
 
+    /// List of errors
+    pub errors: usize,
+
     /// number of skipped suggested fixes
     pub skipped_suggested_fixes: u32,
 }

From b9589ad8bd99e820f0d822f1185d985c2322983c Mon Sep 17 00:00:00 2001
From: Emanuele Stoppa <my.burning@gmail.com>
Date: Tue, 7 Mar 2023 11:32:20 +0000
Subject: [PATCH 2/4] clippy

---
 crates/rome_service/src/file_handlers/javascript.rs | 8 ++++----
 crates/rome_service/src/workspace.rs                | 2 +-
 npm/backend-jsonrpc/src/workspace.ts                | 4 ++++
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/crates/rome_service/src/file_handlers/javascript.rs b/crates/rome_service/src/file_handlers/javascript.rs
index 6cd9c924aba..0f7a3b3eac1 100644
--- a/crates/rome_service/src/file_handlers/javascript.rs
+++ b/crates/rome_service/src/file_handlers/javascript.rs
@@ -391,7 +391,7 @@ fn fix_all(params: FixAllParams) -> Result<FixFileResult, WorkspaceError> {
     };
 
     let mut skipped_suggested_fixes = 0;
-    let mut errors = 0;
+    let mut errors: u16 = 0;
     let analyzer_options = compute_analyzer_options(&settings);
     loop {
         let (action, _) = analyze(&tree, filter, &analyzer_options, |signal| {
@@ -416,7 +416,7 @@ fn fix_all(params: FixAllParams) -> Result<FixFileResult, WorkspaceError> {
                             skipped_suggested_fixes += 1;
                         }
                         if action.applicability == Applicability::Always {
-                            errors -= 1;
+                            errors = errors.saturating_sub(1);
                             return ControlFlow::Break(action);
                         }
                     }
@@ -425,7 +425,7 @@ fn fix_all(params: FixAllParams) -> Result<FixFileResult, WorkspaceError> {
                             action.applicability,
                             Applicability::Always | Applicability::MaybeIncorrect
                         ) {
-                            errors -= 1;
+                            errors = errors.saturating_sub(1);
                             return ControlFlow::Break(action);
                         }
                     }
@@ -463,7 +463,7 @@ fn fix_all(params: FixAllParams) -> Result<FixFileResult, WorkspaceError> {
                     code: tree.syntax().to_string(),
                     skipped_suggested_fixes,
                     actions,
-                    errors,
+                    errors: errors.into(),
                 });
             }
         }
diff --git a/crates/rome_service/src/workspace.rs b/crates/rome_service/src/workspace.rs
index 8303661cc34..cf04e00a957 100644
--- a/crates/rome_service/src/workspace.rs
+++ b/crates/rome_service/src/workspace.rs
@@ -254,7 +254,7 @@ pub struct FixFileResult {
     /// List of all the code actions applied to the file
     pub actions: Vec<FixAction>,
 
-    /// List of errors
+    /// Number of errors
     pub errors: usize,
 
     /// number of skipped suggested fixes
diff --git a/npm/backend-jsonrpc/src/workspace.ts b/npm/backend-jsonrpc/src/workspace.ts
index beec47f6adf..12888c1ad9e 100644
--- a/npm/backend-jsonrpc/src/workspace.ts
+++ b/npm/backend-jsonrpc/src/workspace.ts
@@ -1185,6 +1185,10 @@ export interface FixFileResult {
 	 * New source code for the file with all fixes applied
 	 */
 	code: string;
+	/**
+	 * Number of errors
+	 */
+	errors: number;
 	/**
 	 * number of skipped suggested fixes
 	 */

From b6a23c9121c5cfa2dd40deeb2a061f2bf6113095 Mon Sep 17 00:00:00 2001
From: Emanuele Stoppa <my.burning@gmail.com>
Date: Thu, 9 Mar 2023 16:56:55 +0000
Subject: [PATCH 3/4] update snapshot

---
 crates/rome_cli/tests/commands/check.rs          | 16 ++++++++--------
 .../fs_files_ignore_symlink.snap                 |  7 -------
 .../rome_service/src/file_handlers/javascript.rs |  1 -
 3 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/crates/rome_cli/tests/commands/check.rs b/crates/rome_cli/tests/commands/check.rs
index 9b3685abfd6..14af6579935 100644
--- a/crates/rome_cli/tests/commands/check.rs
+++ b/crates/rome_cli/tests/commands/check.rs
@@ -862,15 +862,15 @@ fn fs_error_unknown() {
 //
 // ├── rome.json
 // ├── hidden_nested
-// │   └── test
-// │       └── symlink_testcase1_2 -> hidden_testcase1
+// │   └── test
+// │       └── symlink_testcase1_2 -> hidden_testcase1
 // ├── hidden_testcase1
-// │   └── test
-// │       └── test.js // ok
+// │   └── test
+// │       └── test.js // ok
 // ├── hidden_testcase2
-// │   ├── test1.ts // ignored
-// │   ├── test2.ts // ignored
-// │   └── test.js  // ok
+// │   ├── test1.ts // ignored
+// │   ├── test2.ts // ignored
+// │   └── test.js  // ok
 // └── src
 //     ├── symlink_testcase1_1 -> hidden_nested
 //     └── symlink_testcase2 -> hidden_testcase2
@@ -951,7 +951,7 @@ fn fs_files_ignore_symlink() {
             OsString::from("check"),
             OsString::from("--config-path"),
             OsString::from(root_path.clone()),
-            OsString::from("--apply"),
+            OsString::from("--apply-unsafe"),
             OsString::from(src_path),
         ]),
     );
diff --git a/crates/rome_cli/tests/snapshots/main_commands_check/fs_files_ignore_symlink.snap b/crates/rome_cli/tests/snapshots/main_commands_check/fs_files_ignore_symlink.snap
index 84e7f82e0a6..89c6908c36b 100644
--- a/crates/rome_cli/tests/snapshots/main_commands_check/fs_files_ignore_symlink.snap
+++ b/crates/rome_cli/tests/snapshots/main_commands_check/fs_files_ignore_symlink.snap
@@ -1,16 +1,9 @@
 ---
 source: crates/rome_cli/tests/snap_test.rs
-assertion_line: 346
 expression: content
 ---
 # Emitted Messages
 
-```block
-Skipped 4 suggested fixes.
-If you wish to apply the suggested (unsafe) fixes, use the command rome check --apply-unsafe
-
-```
-
 ```block
 Fixed 2 file(s) in <TIME>
 ```
diff --git a/crates/rome_service/src/file_handlers/javascript.rs b/crates/rome_service/src/file_handlers/javascript.rs
index 0f7a3b3eac1..6d92a03c2e9 100644
--- a/crates/rome_service/src/file_handlers/javascript.rs
+++ b/crates/rome_service/src/file_handlers/javascript.rs
@@ -397,7 +397,6 @@ fn fix_all(params: FixAllParams) -> Result<FixFileResult, WorkspaceError> {
         let (action, _) = analyze(&tree, filter, &analyzer_options, |signal| {
             let current_diagnostic = signal.diagnostic();
 
-            // all rules have at least an action, which is he suppression
             if let Some(diagnostic) = current_diagnostic.as_ref() {
                 if is_diagnostic_error(diagnostic, params.rules) {
                     errors += 1;

From b27d28053be1696a335da9be9c5a9d4697ca773f Mon Sep 17 00:00:00 2001
From: Emanuele Stoppa <my.burning@gmail.com>
Date: Fri, 10 Mar 2023 09:52:01 +0000
Subject: [PATCH 4/4] fix rule applicability and added tests

---
 crates/rome_cli/src/diagnostics.rs            | 38 ++++++--
 crates/rome_cli/src/execute.rs                |  7 ++
 crates/rome_cli/src/traversal.rs              | 30 ++++++-
 crates/rome_cli/tests/commands/check.rs       | 90 +++++++++++++++----
 crates/rome_cli/tests/configs.rs              |  2 +-
 .../main_commands_check/all_rules.snap        | 50 ++---------
 .../main_commands_check/apply_noop.snap       | 16 +---
 .../main_commands_check/apply_ok.snap         | 16 +---
 .../apply_suggested_with_error.snap           | 56 ++++++++++++
 ..._if_files_are_listed_in_ignore_option.snap |  4 +-
 .../no_lint_if_linter_is_disabled.snap        |  2 +-
 ..._if_linter_is_disabled_when_run_apply.snap |  2 +-
 .../no_lint_when_file_is_ignored.snap         |  2 +-
 .../should_disable_a_rule_group.snap          | 17 +---
 .../src/configuration/linter/rules.rs         | 56 ++++++++++--
 xtask/codegen/src/generate_configuration.rs   |  8 +-
 16 files changed, 267 insertions(+), 129 deletions(-)
 create mode 100644 crates/rome_cli/tests/snapshots/main_commands_check/apply_suggested_with_error.snap

diff --git a/crates/rome_cli/src/diagnostics.rs b/crates/rome_cli/src/diagnostics.rs
index 8d6d1bb2b32..b50c7caebdd 100644
--- a/crates/rome_cli/src/diagnostics.rs
+++ b/crates/rome_cli/src/diagnostics.rs
@@ -36,6 +36,10 @@ pub enum CliDiagnostic {
     IncompatibleArguments(IncompatibleArguments),
     /// Returned by a traversal command when error diagnostics were emitted
     CheckError(CheckError),
+    /// Emitted when a file is fixed, but it still contains diagnostics.
+    ///
+    /// This happens when these diagnostics come from rules that don't have a code action.
+    FileCheckApply(FileCheckApply),
     /// When an argument is higher than the expected maximum
     OverflowNumberArgument(OverflowNumberArgument),
     /// Wrapper for an underlying `rome_service` error
@@ -169,7 +173,7 @@ impl Display for CheckActionKind {
                 "Some errors were emitted while "<Emphasis>"running checks"</Emphasis>
             }),
             CheckActionKind::Apply => fmt.write_markup(markup! {
-                <Emphasis>"Fixes applied"</Emphasis>", but there are still diagnostics to be addressed"
+                "Some errors were emitted while "<Emphasis>"applying fixes"</Emphasis>
             }),
         }
     }
@@ -182,15 +186,23 @@ impl std::fmt::Display for CheckActionKind {
                 write!(f, "Some errors were emitted while running checks")
             }
             CheckActionKind::Apply => {
-                write!(
-                    f,
-                    "Fixes applied but there are still diagnostics to be addressed"
-                )
+                write!(f, "Some errors were emitted while applying fixes")
             }
         }
     }
 }
 
+#[derive(Debug, Diagnostic)]
+#[diagnostic(
+    category = "internalError/io",
+    severity = Error,
+    message = "Fixes applied to the file, but there a still diagnostics to address."
+)]
+pub struct FileCheckApply {
+    #[location(resource)]
+    pub file_path: String,
+}
+
 #[derive(Debug, Diagnostic)]
 #[diagnostic(
     category = "flags/invalid",
@@ -354,6 +366,13 @@ impl CliDiagnostic {
         })
     }
 
+    /// Emitted for a file that has code fixes, but still has diagnostics to address
+    pub fn file_apply_error(file_path: impl Into<String>) -> Self {
+        Self::FileCheckApply(FileCheckApply {
+            file_path: file_path.into(),
+        })
+    }
+
     /// Emitted when the server is not running
     pub fn server_not_running() -> Self {
         Self::ServerNotRunning(ServerNotRunning)
@@ -402,6 +421,7 @@ impl Diagnostic for CliDiagnostic {
             CliDiagnostic::ServerNotRunning(diagnostic) => diagnostic.category(),
             CliDiagnostic::IncompatibleEndConfiguration(diagnostic) => diagnostic.category(),
             CliDiagnostic::NoFilesWereProcessed(diagnostic) => diagnostic.category(),
+            CliDiagnostic::FileCheckApply(diagnostic) => diagnostic.category(),
         }
     }
 
@@ -421,6 +441,7 @@ impl Diagnostic for CliDiagnostic {
             CliDiagnostic::ServerNotRunning(diagnostic) => diagnostic.tags(),
             CliDiagnostic::IncompatibleEndConfiguration(diagnostic) => diagnostic.tags(),
             CliDiagnostic::NoFilesWereProcessed(diagnostic) => diagnostic.tags(),
+            CliDiagnostic::FileCheckApply(diagnostic) => diagnostic.tags(),
         }
     }
 
@@ -440,6 +461,7 @@ impl Diagnostic for CliDiagnostic {
             CliDiagnostic::ServerNotRunning(diagnostic) => diagnostic.severity(),
             CliDiagnostic::IncompatibleEndConfiguration(diagnostic) => diagnostic.severity(),
             CliDiagnostic::NoFilesWereProcessed(diagnostic) => diagnostic.severity(),
+            CliDiagnostic::FileCheckApply(diagnostic) => diagnostic.severity(),
         }
     }
 
@@ -459,6 +481,7 @@ impl Diagnostic for CliDiagnostic {
             CliDiagnostic::ServerNotRunning(diagnostic) => diagnostic.location(),
             CliDiagnostic::IncompatibleEndConfiguration(diagnostic) => diagnostic.location(),
             CliDiagnostic::NoFilesWereProcessed(diagnostic) => diagnostic.location(),
+            CliDiagnostic::FileCheckApply(diagnostic) => diagnostic.location(),
         }
     }
 
@@ -478,6 +501,7 @@ impl Diagnostic for CliDiagnostic {
             CliDiagnostic::ServerNotRunning(diagnostic) => diagnostic.message(fmt),
             CliDiagnostic::IncompatibleEndConfiguration(diagnostic) => diagnostic.message(fmt),
             CliDiagnostic::NoFilesWereProcessed(diagnostic) => diagnostic.message(fmt),
+            CliDiagnostic::FileCheckApply(diagnostic) => diagnostic.message(fmt),
         }
     }
 
@@ -497,6 +521,7 @@ impl Diagnostic for CliDiagnostic {
             CliDiagnostic::ServerNotRunning(diagnostic) => diagnostic.description(fmt),
             CliDiagnostic::IncompatibleEndConfiguration(diagnostic) => diagnostic.description(fmt),
             CliDiagnostic::NoFilesWereProcessed(diagnostic) => diagnostic.description(fmt),
+            CliDiagnostic::FileCheckApply(diagnostic) => diagnostic.description(fmt),
         }
     }
 
@@ -516,6 +541,7 @@ impl Diagnostic for CliDiagnostic {
             CliDiagnostic::ServerNotRunning(diagnostic) => diagnostic.advices(visitor),
             CliDiagnostic::IncompatibleEndConfiguration(diagnostic) => diagnostic.advices(visitor),
             CliDiagnostic::NoFilesWereProcessed(diagnostic) => diagnostic.advices(visitor),
+            CliDiagnostic::FileCheckApply(diagnostic) => diagnostic.advices(visitor),
         }
     }
 
@@ -539,6 +565,7 @@ impl Diagnostic for CliDiagnostic {
                 diagnostic.verbose_advices(visitor)
             }
             CliDiagnostic::NoFilesWereProcessed(diagnostic) => diagnostic.verbose_advices(visitor),
+            CliDiagnostic::FileCheckApply(diagnostic) => diagnostic.verbose_advices(visitor),
         }
     }
 
@@ -558,6 +585,7 @@ impl Diagnostic for CliDiagnostic {
             CliDiagnostic::ServerNotRunning(diagnostic) => diagnostic.source(),
             CliDiagnostic::IncompatibleEndConfiguration(diagnostic) => diagnostic.source(),
             CliDiagnostic::NoFilesWereProcessed(diagnostic) => diagnostic.source(),
+            CliDiagnostic::FileCheckApply(diagnostic) => diagnostic.source(),
         }
     }
 }
diff --git a/crates/rome_cli/src/execute.rs b/crates/rome_cli/src/execute.rs
index a5deb08fe27..f55daa30b8a 100644
--- a/crates/rome_cli/src/execute.rs
+++ b/crates/rome_cli/src/execute.rs
@@ -111,6 +111,13 @@ impl Execution {
         matches!(self.traversal_mode, TraversalMode::Check { .. })
     }
 
+    pub(crate) const fn is_check_apply(&self) -> bool {
+        match self.traversal_mode {
+            TraversalMode::Check { fix_file_mode } => fix_file_mode.is_some(),
+            _ => false,
+        }
+    }
+
     pub(crate) const fn is_format(&self) -> bool {
         matches!(self.traversal_mode, TraversalMode::Format { .. })
     }
diff --git a/crates/rome_cli/src/traversal.rs b/crates/rome_cli/src/traversal.rs
index 444847eb24f..327dc8a3bc2 100644
--- a/crates/rome_cli/src/traversal.rs
+++ b/crates/rome_cli/src/traversal.rs
@@ -208,7 +208,11 @@ pub(crate) fn traverse(execution: Execution, mut session: CliSession) -> Result<
     if count.saturating_sub(skipped) == 0 {
         Err(CliDiagnostic::no_files_processed())
     } else if errors > 0 {
-        Err(CliDiagnostic::check_error())
+        if execution.is_check_apply() {
+            Err(CliDiagnostic::apply_error())
+        } else {
+            Err(CliDiagnostic::check_error())
+        }
     } else {
         Ok(())
     }
@@ -371,6 +375,25 @@ fn process_messages(options: ProcessMessagesOptions) {
                 total_skipped_suggested_fixes += skipped_suggested_fixes;
             }
 
+            Message::ApplyError(error) => {
+                *errors += 1;
+                let should_print = printed_diagnostics < max_diagnostics;
+                if should_print {
+                    printed_diagnostics += 1;
+                    remaining_diagnostics.store(
+                        max_diagnostics.saturating_sub(printed_diagnostics),
+                        Ordering::Relaxed,
+                    );
+                } else {
+                    not_printed_diagnostics += 1;
+                }
+                if mode.should_report_to_terminal() && should_print {
+                    console.error(markup! {
+                        {if verbose { PrintDiagnostic::verbose(&error) } else { PrintDiagnostic::simple(&error) }}
+                    });
+                }
+            }
+
             Message::Error(mut err) => {
                 let location = err.location();
                 if let Some(Resource::File(file_path)) = location.resource.as_ref() {
@@ -828,8 +851,8 @@ fn process_file(ctx: &TraversalOptions, path: &Path) -> FileResult {
             return if fixed.errors == 0 {
                 Ok(FileStatus::Success)
             } else {
-                Ok(FileStatus::Message(Message::Error(
-                    CliDiagnostic::apply_error().into(),
+                Ok(FileStatus::Message(Message::ApplyError(
+                    CliDiagnostic::file_apply_error(path.display().to_string()),
                 )))
             };
         }
@@ -948,6 +971,7 @@ enum Message {
         /// Suggested fixes skipped during the lint traversal
         skipped_suggested_fixes: u32,
     },
+    ApplyError(CliDiagnostic),
     Error(Error),
     Diagnostics {
         name: String,
diff --git a/crates/rome_cli/tests/commands/check.rs b/crates/rome_cli/tests/commands/check.rs
index 14af6579935..c3c430c334e 100644
--- a/crates/rome_cli/tests/commands/check.rs
+++ b/crates/rome_cli/tests/commands/check.rs
@@ -36,10 +36,10 @@ const NO_DEBUGGER: &str = "debugger;";
 const NEW_SYMBOL: &str = "new Symbol(\"\");";
 
 const FIX_BEFORE: &str = "
-if(a != -0) {}
+(1 >= -0)
 ";
 const FIX_AFTER: &str = "
-if(a != 0) {}
+(1 >= 0)
 ";
 
 const APPLY_SUGGESTED_BEFORE: &str = "let a = 4;
@@ -52,19 +52,6 @@ const APPLY_SUGGESTED_AFTER: &str = "const a = 4;\nconsole.log(a);\n";
 const NO_DEBUGGER_BEFORE: &str = "debugger;";
 const NO_DEBUGGER_AFTER: &str = "debugger;";
 
-const JS_ERRORS_BEFORE: &str = r#"try {
-    !a && !b;
-} catch (err) {
-    err = 24;
-}
-"#;
-const JS_ERRORS_AFTER: &str = "try {
-    !a && !b;
-} catch (err) {
-    err = 24;
-}
-";
-
 const UPGRADE_SEVERITY_CODE: &str = r#"if(!cond) { exprA(); } else { exprB() }"#;
 
 const NURSERY_UNSTABLE: &str = r#"if(a = b) {}"#;
@@ -253,8 +240,6 @@ fn apply_noop() {
         ]),
     );
 
-    println!("{console:#?}");
-
     assert!(result.is_ok(), "run_cli returned {result:?}");
 
     assert_cli_snapshot(SnapshotPayload::new(
@@ -333,6 +318,73 @@ fn apply_suggested() {
     ));
 }
 
+#[test]
+fn apply_suggested_with_error() {
+    let mut fs = MemoryFileSystem::default();
+    let mut console = BufferConsole::default();
+
+    // last line doesn't have code fix
+    let source = "let a = 4;
+debugger;
+console.log(a);
+function f() { arguments; }
+";
+
+    let expected = "const a = 4;
+console.log(a);
+function f() { arguments; }
+";
+
+    let test1 = Path::new("test1.js");
+    fs.insert(test1.into(), source.as_bytes());
+
+    let test2 = Path::new("test2.js");
+    fs.insert(test2.into(), source.as_bytes());
+
+    let result = run_cli(
+        DynRef::Borrowed(&mut fs),
+        &mut console,
+        Arguments::from_vec(vec![
+            OsString::from("check"),
+            OsString::from("--apply-unsafe"),
+            test1.as_os_str().into(),
+            test2.as_os_str().into(),
+        ]),
+    );
+
+    assert!(result.is_err(), "run_cli returned {result:?}");
+
+    let mut file = fs
+        .open(test1)
+        .expect("formatting target file was removed by the CLI");
+
+    let mut content = String::new();
+    file.read_to_string(&mut content)
+        .expect("failed to read file from memory FS");
+
+    assert_eq!(content, expected);
+    drop(file);
+
+    content.clear();
+
+    let mut file = fs
+        .open(test2)
+        .expect("formatting target file was removed by the CLI");
+
+    file.read_to_string(&mut content)
+        .expect("failed to read file from memory FS");
+
+    drop(file);
+
+    assert_cli_snapshot(SnapshotPayload::new(
+        module_path!(),
+        "apply_suggested_with_error",
+        fs,
+        console,
+        result,
+    ));
+}
+
 #[test]
 fn no_lint_if_linter_is_disabled_when_run_apply() {
     let mut fs = MemoryFileSystem::default();
@@ -455,7 +507,7 @@ fn should_disable_a_rule_group() {
     let mut console = BufferConsole::default();
 
     let file_path = Path::new("fix.js");
-    fs.insert(file_path.into(), JS_ERRORS_BEFORE.as_bytes());
+    fs.insert(file_path.into(), FIX_BEFORE.as_bytes());
 
     let config_path = Path::new("rome.json");
     fs.insert(
@@ -481,7 +533,7 @@ fn should_disable_a_rule_group() {
         .read_to_string(&mut buffer)
         .unwrap();
 
-    assert_eq!(buffer, JS_ERRORS_AFTER);
+    assert_eq!(buffer, FIX_BEFORE);
 
     assert_cli_snapshot(SnapshotPayload::new(
         module_path!(),
diff --git a/crates/rome_cli/tests/configs.rs b/crates/rome_cli/tests/configs.rs
index 2bfc6981beb..b9af6a8e8fe 100644
--- a/crates/rome_cli/tests/configs.rs
+++ b/crates/rome_cli/tests/configs.rs
@@ -131,7 +131,7 @@ pub const CONFIG_LINTER_SUPPRESSED_GROUP: &str = r#"{
   "linter": {
     "rules": {
         "recommended": true,
-        "correctness": {
+        "suspicious": {
             "recommended": false
         }
     }
diff --git a/crates/rome_cli/tests/snapshots/main_commands_check/all_rules.snap b/crates/rome_cli/tests/snapshots/main_commands_check/all_rules.snap
index 4aaf1ce40a9..64677ce321f 100644
--- a/crates/rome_cli/tests/snapshots/main_commands_check/all_rules.snap
+++ b/crates/rome_cli/tests/snapshots/main_commands_check/all_rules.snap
@@ -16,7 +16,7 @@ expression: content
 
 ```js
 
-if(a != -0) {}
+(1 >= -0)
 
 ```
 
@@ -34,54 +34,18 @@ internalError/io ━━━━━━━━━━━━━━━━━━━━━
 # Emitted Messages
 
 ```block
-fix.js:2:4 lint/suspicious/noCompareNegZero  FIXABLE  ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+fix.js:2:2 lint/suspicious/noCompareNegZero  FIXABLE  ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
 
-  × Do not use the != operator to compare against -0.
+  × Do not use the >= operator to compare against -0.
   
-  > 2 │ if(a != -0) {}
-      │    ^^^^^^^
+  > 2 │ (1 >= -0)
+      │  ^^^^^^^
     3 │ 
   
   i Safe fix: Replace -0 with 0
   
-    2 │ if(a·!=·-0)·{}
-      │         -     
-
-```
-
-```block
-fix.js:2:6 lint/suspicious/noDoubleEquals  FIXABLE  ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
-
-  × Use !== instead of !=
-  
-  > 2 │ if(a != -0) {}
-      │      ^^
-    3 │ 
-  
-  i != is only allowed when comparing against null
-  
-  > 2 │ if(a != -0) {}
-      │      ^^
-    3 │ 
-  
-  i Using !== may be unsafe if you are relying on type coercion
-  
-  i Suggested fix: Use !==
-  
-    2 │ if(a·!==·-0)·{}
-      │        +       
-
-```
-
-```block
-fix.js:2:4 lint/correctness/noUndeclaredVariables ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
-
-  ! The a variable is undeclared
-  
-  > 2 │ if(a != -0) {}
-      │    ^
-    3 │ 
-  
+    2 │ (1·>=·-0)
+      │       -  
 
 ```
 
diff --git a/crates/rome_cli/tests/snapshots/main_commands_check/apply_noop.snap b/crates/rome_cli/tests/snapshots/main_commands_check/apply_noop.snap
index 08a8eeb66d5..4a27cf38a56 100644
--- a/crates/rome_cli/tests/snapshots/main_commands_check/apply_noop.snap
+++ b/crates/rome_cli/tests/snapshots/main_commands_check/apply_noop.snap
@@ -6,26 +6,12 @@ expression: content
 
 ```js
 
-if(a != 0) {}
+(1 >= 0)
 
 ```
 
 # Emitted Messages
 
-```block
-internalError/io ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
-
-  × Fixes applied, but there are still diagnostics to be addressed
-  
-
-```
-
-```block
-Skipped 1 suggested fixes.
-If you wish to apply the suggested (unsafe) fixes, use the command rome check --apply-unsafe
-
-```
-
 ```block
 Fixed 1 file(s) in <TIME>
 ```
diff --git a/crates/rome_cli/tests/snapshots/main_commands_check/apply_ok.snap b/crates/rome_cli/tests/snapshots/main_commands_check/apply_ok.snap
index 08a8eeb66d5..4a27cf38a56 100644
--- a/crates/rome_cli/tests/snapshots/main_commands_check/apply_ok.snap
+++ b/crates/rome_cli/tests/snapshots/main_commands_check/apply_ok.snap
@@ -6,26 +6,12 @@ expression: content
 
 ```js
 
-if(a != 0) {}
+(1 >= 0)
 
 ```
 
 # Emitted Messages
 
-```block
-internalError/io ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
-
-  × Fixes applied, but there are still diagnostics to be addressed
-  
-
-```
-
-```block
-Skipped 1 suggested fixes.
-If you wish to apply the suggested (unsafe) fixes, use the command rome check --apply-unsafe
-
-```
-
 ```block
 Fixed 1 file(s) in <TIME>
 ```
diff --git a/crates/rome_cli/tests/snapshots/main_commands_check/apply_suggested_with_error.snap b/crates/rome_cli/tests/snapshots/main_commands_check/apply_suggested_with_error.snap
new file mode 100644
index 00000000000..cd11f307b8e
--- /dev/null
+++ b/crates/rome_cli/tests/snapshots/main_commands_check/apply_suggested_with_error.snap
@@ -0,0 +1,56 @@
+---
+source: crates/rome_cli/tests/snap_test.rs
+expression: content
+---
+## `test1.js`
+
+```js
+const a = 4;
+console.log(a);
+function f() { arguments; }
+
+```
+
+## `test2.js`
+
+```js
+const a = 4;
+console.log(a);
+function f() { arguments; }
+
+```
+
+# Termination Message
+
+```block
+internalError/io ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+
+  × Some errors were emitted while applying fixes
+  
+
+
+```
+
+# Emitted Messages
+
+```block
+test1.js internalError/io ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+
+  × Fixes applied to the file, but there a still diagnostics to address.
+  
+
+```
+
+```block
+test2.js internalError/io ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+
+  × Fixes applied to the file, but there a still diagnostics to address.
+  
+
+```
+
+```block
+Fixed 2 file(s) in <TIME>
+```
+
+
diff --git a/crates/rome_cli/tests/snapshots/main_commands_check/no_lint_if_files_are_listed_in_ignore_option.snap b/crates/rome_cli/tests/snapshots/main_commands_check/no_lint_if_files_are_listed_in_ignore_option.snap
index 7eaca952e02..0ee28a3e26d 100644
--- a/crates/rome_cli/tests/snapshots/main_commands_check/no_lint_if_files_are_listed_in_ignore_option.snap
+++ b/crates/rome_cli/tests/snapshots/main_commands_check/no_lint_if_files_are_listed_in_ignore_option.snap
@@ -20,7 +20,7 @@ expression: content
 
 ```js
 
-if(a != -0) {}
+(1 >= -0)
 
 ```
 
@@ -28,7 +28,7 @@ if(a != -0) {}
 
 ```js
 
-if(a != -0) {}
+(1 >= -0)
 
 ```
 
diff --git a/crates/rome_cli/tests/snapshots/main_commands_check/no_lint_if_linter_is_disabled.snap b/crates/rome_cli/tests/snapshots/main_commands_check/no_lint_if_linter_is_disabled.snap
index eff663ebe43..021a616aeb7 100644
--- a/crates/rome_cli/tests/snapshots/main_commands_check/no_lint_if_linter_is_disabled.snap
+++ b/crates/rome_cli/tests/snapshots/main_commands_check/no_lint_if_linter_is_disabled.snap
@@ -16,7 +16,7 @@ expression: content
 
 ```js
 
-if(a != -0) {}
+(1 >= -0)
 
 ```
 
diff --git a/crates/rome_cli/tests/snapshots/main_commands_check/no_lint_if_linter_is_disabled_when_run_apply.snap b/crates/rome_cli/tests/snapshots/main_commands_check/no_lint_if_linter_is_disabled_when_run_apply.snap
index 83f681ba3dc..175547f39bd 100644
--- a/crates/rome_cli/tests/snapshots/main_commands_check/no_lint_if_linter_is_disabled_when_run_apply.snap
+++ b/crates/rome_cli/tests/snapshots/main_commands_check/no_lint_if_linter_is_disabled_when_run_apply.snap
@@ -16,7 +16,7 @@ expression: content
 
 ```js
 
-if(a != -0) {}
+(1 >= -0)
 
 ```
 
diff --git a/crates/rome_cli/tests/snapshots/main_commands_check/no_lint_when_file_is_ignored.snap b/crates/rome_cli/tests/snapshots/main_commands_check/no_lint_when_file_is_ignored.snap
index f5965eb8095..0ad140d38f8 100644
--- a/crates/rome_cli/tests/snapshots/main_commands_check/no_lint_when_file_is_ignored.snap
+++ b/crates/rome_cli/tests/snapshots/main_commands_check/no_lint_when_file_is_ignored.snap
@@ -17,7 +17,7 @@ expression: content
 
 ```js
 
-if(a != -0) {}
+(1 >= -0)
 
 ```
 
diff --git a/crates/rome_cli/tests/snapshots/main_commands_check/should_disable_a_rule_group.snap b/crates/rome_cli/tests/snapshots/main_commands_check/should_disable_a_rule_group.snap
index 01c0283960f..9eda4548cef 100644
--- a/crates/rome_cli/tests/snapshots/main_commands_check/should_disable_a_rule_group.snap
+++ b/crates/rome_cli/tests/snapshots/main_commands_check/should_disable_a_rule_group.snap
@@ -9,7 +9,7 @@ expression: content
   "linter": {
     "rules": {
       "recommended": true,
-      "correctness": {
+      "suspicious": {
         "recommended": false
       }
     }
@@ -20,24 +20,13 @@ expression: content
 ## `fix.js`
 
 ```js
-try {
-    !a && !b;
-} catch (err) {
-    err = 24;
-}
+
+(1 >= -0)
 
 ```
 
 # Emitted Messages
 
-```block
-internalError/io ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
-
-  × Fixes applied, but there are still diagnostics to be addressed
-  
-
-```
-
 ```block
 Fixed 1 file(s) in <TIME>
 ```
diff --git a/crates/rome_service/src/configuration/linter/rules.rs b/crates/rome_service/src/configuration/linter/rules.rs
index dd702481eb9..1e8c9243f3e 100644
--- a/crates/rome_service/src/configuration/linter/rules.rs
+++ b/crates/rome_service/src/configuration/linter/rules.rs
@@ -435,6 +435,9 @@ impl A11y {
         RuleFilter::Rule(Self::GROUP_NAME, Self::GROUP_RULES[12]),
     ];
     pub(crate) fn is_recommended(&self) -> bool { !matches!(self.recommended, Some(false)) }
+    pub(crate) const fn is_not_recommended(&self) -> bool {
+        matches!(self.recommended, Some(false))
+    }
     pub(crate) fn is_all(&self) -> bool { matches!(self.all, Some(true)) }
     pub(crate) fn is_not_all(&self) -> bool { matches!(self.all, Some(false)) }
     pub(crate) fn get_enabled_rules(&self) -> IndexSet<RuleFilter> {
@@ -596,8 +599,10 @@ impl A11y {
             enabled_rules.extend(Self::all_rules_as_filters());
         } else if self.is_not_all() {
             disabled_rules.extend(Self::all_rules_as_filters());
-        } else if is_recommended || self.is_recommended() {
+        } else if (is_recommended && !self.is_not_recommended()) || self.is_recommended() {
             enabled_rules.extend(Self::recommended_rules_as_filters());
+        } else if self.is_not_recommended() {
+            disabled_rules.extend(Self::recommended_rules_as_filters());
         }
     }
     pub(crate) fn get_rule_configuration(&self, rule_name: &str) -> Option<&RuleConfiguration> {
@@ -680,6 +685,9 @@ impl Complexity {
         RuleFilter::Rule(Self::GROUP_NAME, Self::GROUP_RULES[5]),
     ];
     pub(crate) fn is_recommended(&self) -> bool { !matches!(self.recommended, Some(false)) }
+    pub(crate) const fn is_not_recommended(&self) -> bool {
+        matches!(self.recommended, Some(false))
+    }
     pub(crate) fn is_all(&self) -> bool { matches!(self.all, Some(true)) }
     pub(crate) fn is_not_all(&self) -> bool { matches!(self.all, Some(false)) }
     pub(crate) fn get_enabled_rules(&self) -> IndexSet<RuleFilter> {
@@ -777,8 +785,10 @@ impl Complexity {
             enabled_rules.extend(Self::all_rules_as_filters());
         } else if self.is_not_all() {
             disabled_rules.extend(Self::all_rules_as_filters());
-        } else if is_recommended || self.is_recommended() {
+        } else if (is_recommended && !self.is_not_recommended()) || self.is_recommended() {
             enabled_rules.extend(Self::recommended_rules_as_filters());
+        } else if self.is_not_recommended() {
+            disabled_rules.extend(Self::recommended_rules_as_filters());
         }
     }
     pub(crate) fn get_rule_configuration(&self, rule_name: &str) -> Option<&RuleConfiguration> {
@@ -933,6 +943,9 @@ impl Correctness {
         RuleFilter::Rule(Self::GROUP_NAME, Self::GROUP_RULES[16]),
     ];
     pub(crate) fn is_recommended(&self) -> bool { !matches!(self.recommended, Some(false)) }
+    pub(crate) const fn is_not_recommended(&self) -> bool {
+        matches!(self.recommended, Some(false))
+    }
     pub(crate) fn is_all(&self) -> bool { matches!(self.all, Some(true)) }
     pub(crate) fn is_not_all(&self) -> bool { matches!(self.all, Some(false)) }
     pub(crate) fn get_enabled_rules(&self) -> IndexSet<RuleFilter> {
@@ -1134,8 +1147,10 @@ impl Correctness {
             enabled_rules.extend(Self::all_rules_as_filters());
         } else if self.is_not_all() {
             disabled_rules.extend(Self::all_rules_as_filters());
-        } else if is_recommended || self.is_recommended() {
+        } else if (is_recommended && !self.is_not_recommended()) || self.is_recommended() {
             enabled_rules.extend(Self::recommended_rules_as_filters());
+        } else if self.is_not_recommended() {
+            disabled_rules.extend(Self::recommended_rules_as_filters());
         }
     }
     pub(crate) fn get_rule_configuration(&self, rule_name: &str) -> Option<&RuleConfiguration> {
@@ -1478,6 +1493,9 @@ impl Nursery {
         RuleFilter::Rule(Self::GROUP_NAME, Self::GROUP_RULES[43]),
     ];
     pub(crate) fn is_recommended(&self) -> bool { !matches!(self.recommended, Some(false)) }
+    pub(crate) const fn is_not_recommended(&self) -> bool {
+        matches!(self.recommended, Some(false))
+    }
     pub(crate) fn is_all(&self) -> bool { matches!(self.all, Some(true)) }
     pub(crate) fn is_not_all(&self) -> bool { matches!(self.all, Some(false)) }
     pub(crate) fn get_enabled_rules(&self) -> IndexSet<RuleFilter> {
@@ -1949,8 +1967,10 @@ impl Nursery {
             enabled_rules.extend(Self::all_rules_as_filters());
         } else if self.is_not_all() {
             disabled_rules.extend(Self::all_rules_as_filters());
-        } else if is_recommended || self.is_recommended() {
+        } else if (is_recommended && !self.is_not_recommended()) || self.is_recommended() {
             enabled_rules.extend(Self::recommended_rules_as_filters());
+        } else if self.is_not_recommended() {
+            disabled_rules.extend(Self::recommended_rules_as_filters());
         }
     }
     pub(crate) fn get_rule_configuration(&self, rule_name: &str) -> Option<&RuleConfiguration> {
@@ -2029,6 +2049,9 @@ impl Performance {
     const ALL_RULES_AS_FILTERS: [RuleFilter<'static>; 1] =
         [RuleFilter::Rule(Self::GROUP_NAME, Self::GROUP_RULES[0])];
     pub(crate) fn is_recommended(&self) -> bool { !matches!(self.recommended, Some(false)) }
+    pub(crate) const fn is_not_recommended(&self) -> bool {
+        matches!(self.recommended, Some(false))
+    }
     pub(crate) fn is_all(&self) -> bool { matches!(self.all, Some(true)) }
     pub(crate) fn is_not_all(&self) -> bool { matches!(self.all, Some(false)) }
     pub(crate) fn get_enabled_rules(&self) -> IndexSet<RuleFilter> {
@@ -2070,8 +2093,10 @@ impl Performance {
             enabled_rules.extend(Self::all_rules_as_filters());
         } else if self.is_not_all() {
             disabled_rules.extend(Self::all_rules_as_filters());
-        } else if is_recommended || self.is_recommended() {
+        } else if (is_recommended && !self.is_not_recommended()) || self.is_recommended() {
             enabled_rules.extend(Self::recommended_rules_as_filters());
+        } else if self.is_not_recommended() {
+            disabled_rules.extend(Self::recommended_rules_as_filters());
         }
     }
     pub(crate) fn get_rule_configuration(&self, rule_name: &str) -> Option<&RuleConfiguration> {
@@ -2118,6 +2143,9 @@ impl Security {
         RuleFilter::Rule(Self::GROUP_NAME, Self::GROUP_RULES[1]),
     ];
     pub(crate) fn is_recommended(&self) -> bool { !matches!(self.recommended, Some(false)) }
+    pub(crate) const fn is_not_recommended(&self) -> bool {
+        matches!(self.recommended, Some(false))
+    }
     pub(crate) fn is_all(&self) -> bool { matches!(self.all, Some(true)) }
     pub(crate) fn is_not_all(&self) -> bool { matches!(self.all, Some(false)) }
     pub(crate) fn get_enabled_rules(&self) -> IndexSet<RuleFilter> {
@@ -2169,8 +2197,10 @@ impl Security {
             enabled_rules.extend(Self::all_rules_as_filters());
         } else if self.is_not_all() {
             disabled_rules.extend(Self::all_rules_as_filters());
-        } else if is_recommended || self.is_recommended() {
+        } else if (is_recommended && !self.is_not_recommended()) || self.is_recommended() {
             enabled_rules.extend(Self::recommended_rules_as_filters());
+        } else if self.is_not_recommended() {
+            disabled_rules.extend(Self::recommended_rules_as_filters());
         }
     }
     pub(crate) fn get_rule_configuration(&self, rule_name: &str) -> Option<&RuleConfiguration> {
@@ -2330,6 +2360,9 @@ impl Style {
         RuleFilter::Rule(Self::GROUP_NAME, Self::GROUP_RULES[19]),
     ];
     pub(crate) fn is_recommended(&self) -> bool { !matches!(self.recommended, Some(false)) }
+    pub(crate) const fn is_not_recommended(&self) -> bool {
+        matches!(self.recommended, Some(false))
+    }
     pub(crate) fn is_all(&self) -> bool { matches!(self.all, Some(true)) }
     pub(crate) fn is_not_all(&self) -> bool { matches!(self.all, Some(false)) }
     pub(crate) fn get_enabled_rules(&self) -> IndexSet<RuleFilter> {
@@ -2561,8 +2594,10 @@ impl Style {
             enabled_rules.extend(Self::all_rules_as_filters());
         } else if self.is_not_all() {
             disabled_rules.extend(Self::all_rules_as_filters());
-        } else if is_recommended || self.is_recommended() {
+        } else if (is_recommended && !self.is_not_recommended()) || self.is_recommended() {
             enabled_rules.extend(Self::recommended_rules_as_filters());
+        } else if self.is_not_recommended() {
+            disabled_rules.extend(Self::recommended_rules_as_filters());
         }
     }
     pub(crate) fn get_rule_configuration(&self, rule_name: &str) -> Option<&RuleConfiguration> {
@@ -2766,6 +2801,9 @@ impl Suspicious {
         RuleFilter::Rule(Self::GROUP_NAME, Self::GROUP_RULES[21]),
     ];
     pub(crate) fn is_recommended(&self) -> bool { !matches!(self.recommended, Some(false)) }
+    pub(crate) const fn is_not_recommended(&self) -> bool {
+        matches!(self.recommended, Some(false))
+    }
     pub(crate) fn is_all(&self) -> bool { matches!(self.all, Some(true)) }
     pub(crate) fn is_not_all(&self) -> bool { matches!(self.all, Some(false)) }
     pub(crate) fn get_enabled_rules(&self) -> IndexSet<RuleFilter> {
@@ -3017,8 +3055,10 @@ impl Suspicious {
             enabled_rules.extend(Self::all_rules_as_filters());
         } else if self.is_not_all() {
             disabled_rules.extend(Self::all_rules_as_filters());
-        } else if is_recommended || self.is_recommended() {
+        } else if (is_recommended && !self.is_not_recommended()) || self.is_recommended() {
             enabled_rules.extend(Self::recommended_rules_as_filters());
+        } else if self.is_not_recommended() {
+            disabled_rules.extend(Self::recommended_rules_as_filters());
         }
     }
     pub(crate) fn get_rule_configuration(&self, rule_name: &str) -> Option<&RuleConfiguration> {
diff --git a/xtask/codegen/src/generate_configuration.rs b/xtask/codegen/src/generate_configuration.rs
index 63d9b4bd4fc..c5b4b09d07f 100644
--- a/xtask/codegen/src/generate_configuration.rs
+++ b/xtask/codegen/src/generate_configuration.rs
@@ -482,6 +482,10 @@ fn generate_struct(group: &str, rules: &BTreeMap<&'static str, RuleMetadata>) ->
                 !matches!(self.recommended, Some(false))
             }
 
+            pub(crate) const fn is_not_recommended(&self) -> bool {
+                matches!(self.recommended, Some(false))
+            }
+
             pub(crate) fn is_all(&self) -> bool {
                 matches!(self.all, Some(true))
             }
@@ -531,8 +535,10 @@ fn generate_struct(group: &str, rules: &BTreeMap<&'static str, RuleMetadata>) ->
                     enabled_rules.extend(Self::all_rules_as_filters());
                 } else if self.is_not_all() {
                     disabled_rules.extend(Self::all_rules_as_filters());
-                } else if is_recommended || self.is_recommended() {
+                } else if (is_recommended && !self.is_not_recommended()) || self.is_recommended() {
                     enabled_rules.extend(Self::recommended_rules_as_filters());
+                } else if self.is_not_recommended() {
+                    disabled_rules.extend(Self::recommended_rules_as_filters());
                 }
             }