Add an option to opt out of human-readable names

crates/ruff/src/lib.rs

@@ -375,6 +375,7 @@ pub fn check(args: CheckCommand, global_options: GlobalConfigArgs) -> Result<Exi
     // TODO: this should reference the global preview mode once https://github.com/astral-sh/ruff/issues/8232
     //   is resolved.
     let preview = pyproject_config.settings.linter.preview;
+    let prefer_rule_codes = pyproject_config.settings.linter.prefer_rule_codes_in_output;
 
     if cli.watch {
         // Configure the file watcher.
@@ -400,7 +401,7 @@ pub fn check(args: CheckCommand, global_options: GlobalConfigArgs) -> Result<Exi
             fix_mode,
             unsafe_fixes,
         )?;
-        printer.write_continuously(&mut writer, &diagnostics, preview)?;
+        printer.write_continuously(&mut writer, &diagnostics, preview, prefer_rule_codes)?;
 
         // In watch mode, we may need to re-resolve the configuration.
         // TODO(charlie): Re-compute other derivative values, like the `printer`.
@@ -427,7 +428,7 @@ pub fn check(args: CheckCommand, global_options: GlobalConfigArgs) -> Result<Exi
                 fix_mode,
                 unsafe_fixes,
             )?;
-            printer.write_continuously(&mut writer, &diagnostics, preview)?;
+            printer.write_continuously(&mut writer, &diagnostics, preview, prefer_rule_codes)?;
         }
     } else {
         // Generate lint violations.
@@ -462,7 +463,12 @@ pub fn check(args: CheckCommand, global_options: GlobalConfigArgs) -> Result<Exi
         if cli.statistics {
             printer.write_statistics(&diagnostics, &mut summary_writer)?;
         } else {
-            printer.write_once(&diagnostics, &mut summary_writer, preview)?;
+            printer.write_once(
+                &diagnostics,
+                &mut summary_writer,
+                preview,
+                prefer_rule_codes,
+            )?;
         }
 
         if !cli.exit_zero {

crates/ruff/src/printer.rs

@@ -210,6 +210,7 @@ impl Printer {
         diagnostics: &Diagnostics,
         writer: &mut dyn Write,
         preview: PreviewMode,
+        prefer_rule_codes: bool,
     ) -> Result<()> {
         if matches!(self.log_level, LogLevel::Silent) {
             return Ok(());
@@ -223,7 +224,7 @@ impl Printer {
                 if self.flags.intersects(Flags::SHOW_FIX_SUMMARY) {
                     if !diagnostics.fixed.is_empty() {
                         writeln!(writer)?;
-                        print_fix_summary(writer, &diagnostics.fixed, preview)?;
+                        print_fix_summary(writer, &diagnostics.fixed, preview, prefer_rule_codes)?;
                         writeln!(writer)?;
                     }
                 }
@@ -237,6 +238,7 @@ impl Printer {
 
         let config = DisplayDiagnosticConfig::new("ruff")
             .preview(preview.is_enabled())
+            .prefer_rule_codes(prefer_rule_codes)
             .hide_severity(true)
             .color(!cfg!(test) && colored::control::SHOULD_COLORIZE.should_colorize())
             .with_show_fix_status(show_fix_status(self.fix_mode, fixables.as_ref()))
@@ -251,7 +253,7 @@ impl Printer {
             if self.flags.intersects(Flags::SHOW_FIX_SUMMARY) {
                 if !diagnostics.fixed.is_empty() {
                     writeln!(writer)?;
-                    print_fix_summary(writer, &diagnostics.fixed, preview)?;
+                    print_fix_summary(writer, &diagnostics.fixed, preview, prefer_rule_codes)?;
                     writeln!(writer)?;
                 }
             }
@@ -383,6 +385,7 @@ impl Printer {
         writer: &mut dyn Write,
         diagnostics: &Diagnostics,
         preview: PreviewMode,
+        prefer_rule_codes: bool,
     ) -> Result<()> {
         if matches!(self.log_level, LogLevel::Silent) {
             return Ok(());
@@ -410,6 +413,7 @@ impl Printer {
             let context = EmitterContext::new(&diagnostics.notebook_indexes);
             let config = DisplayDiagnosticConfig::new("ruff")
                 .preview(preview.is_enabled())
+                .prefer_rule_codes(prefer_rule_codes)
                 .hide_severity(true)
                 .color(!cfg!(test) && colored::control::SHOULD_COLORIZE.should_colorize())
                 .with_show_fix_status(show_fix_status(self.fix_mode, fixables.as_ref()))
@@ -445,7 +449,12 @@ fn show_fix_status(fix_mode: flags::FixMode, fixables: Option<&FixableStatistics
     (!fix_mode.is_apply()) && fixables.is_some_and(FixableStatistics::any_applicable_fixes)
 }
 
-fn print_fix_summary(writer: &mut dyn Write, fixed: &FixMap, preview: PreviewMode) -> Result<()> {
+fn print_fix_summary(
+    writer: &mut dyn Write,
+    fixed: &FixMap,
+    preview: PreviewMode,
+    prefer_rule_codes: bool,
+) -> Result<()> {
     let total = fixed
         .values()
         .map(|table| table.counts().sum::<usize>())
@@ -475,7 +484,7 @@ fn print_fix_summary(writer: &mut dyn Write, fixed: &FixMap, preview: PreviewMod
             ":".cyan()
         )?;
         for (code, name, count) in table.iter().sorted_by_key(|(.., count)| Reverse(*count)) {
-            if is_human_readable_names_enabled(preview) {
+            if is_human_readable_names_enabled(preview) && !prefer_rule_codes {
                 writeln!(
                     writer,
                     "    {count:>num_digits$} × {name} ({code})",

crates/ruff/tests/cli/lint.rs

@@ -1445,6 +1445,7 @@ fn value_given_to_table_key_is_not_inline_table_2() {
     - `lint.extend-per-file-ignores`
     - `lint.exclude`
     - `lint.preview`
+    - `lint.prefer-rule-codes-in-output`
     - `lint.typing-extensions`
     - `lint.future-annotations`
 
@@ -4273,6 +4274,31 @@ class Foo:
     );
 }
 
+#[test]
+fn prefer_rule_codes_in_output() {
+    assert_cmd_snapshot!(
+        Command::new(get_cargo_bin(BIN_NAME))
+            .args(STDIN_BASE_OPTIONS)
+            .args([
+                "--preview",
+                "--config",
+                "lint.prefer-rule-codes-in-output = true",
+                "--select=A001",
+                "-",
+            ])
+            .pass_stdin("print = 1\n"),
+        @"
+    success: false
+    exit_code: 1
+    ----- stdout -----
+    -:1:1: A001 Variable `print` is shadowing a Python builtin
+    Found 1 error.
+
+    ----- stderr -----
+    "
+    );
+}
+
 #[test_case::test_case("concise")]
 #[test_case::test_case("full")]
 #[test_case::test_case("json")]

crates/ruff/tests/cli/snapshots/cli__lint__requires_python_extend_from_shared_config.snap

@@ -82,6 +82,7 @@ linter.safety_table.forced_unsafe = []
 linter.unresolved_target_version = 3.11
 linter.per_file_target_version = {}
 linter.preview = disabled
+linter.prefer_rule_codes_in_output = false
 linter.explicit_preview_rules = false
 linter.extension = ExtensionMapping({})
 linter.allowed_confusables = []

crates/ruff/tests/cli/snapshots/cli__lint__requires_python_no_tool.snap

@@ -84,6 +84,7 @@ linter.safety_table.forced_unsafe = []
 linter.unresolved_target_version = 3.11
 linter.per_file_target_version = {}
 linter.preview = disabled
+linter.prefer_rule_codes_in_output = false
 linter.explicit_preview_rules = false
 linter.extension = ExtensionMapping({})
 linter.allowed_confusables = []

crates/ruff/tests/cli/snapshots/cli__lint__requires_python_no_tool_preview_enabled.snap

@@ -86,6 +86,7 @@ linter.safety_table.forced_unsafe = []
 linter.unresolved_target_version = 3.11
 linter.per_file_target_version = {}
 linter.preview = enabled
+linter.prefer_rule_codes_in_output = false
 linter.explicit_preview_rules = false
 linter.extension = ExtensionMapping({})
 linter.allowed_confusables = []

crates/ruff/tests/cli/snapshots/cli__lint__requires_python_no_tool_target_version_override.snap

@@ -86,6 +86,7 @@ linter.safety_table.forced_unsafe = []
 linter.unresolved_target_version = 3.10
 linter.per_file_target_version = {}
 linter.preview = disabled
+linter.prefer_rule_codes_in_output = false
 linter.explicit_preview_rules = false
 linter.extension = ExtensionMapping({})
 linter.allowed_confusables = []

crates/ruff/tests/cli/snapshots/cli__lint__requires_python_pyproject_toml_above.snap

@@ -83,6 +83,7 @@ linter.safety_table.forced_unsafe = []
 linter.unresolved_target_version = 3.11
 linter.per_file_target_version = {}
 linter.preview = disabled
+linter.prefer_rule_codes_in_output = false
 linter.explicit_preview_rules = false
 linter.extension = ExtensionMapping({})
 linter.allowed_confusables = []

crates/ruff/tests/cli/snapshots/cli__lint__requires_python_pyproject_toml_above_with_tool.snap

@@ -84,6 +84,7 @@ linter.safety_table.forced_unsafe = []
 linter.unresolved_target_version = 3.10
 linter.per_file_target_version = {}
 linter.preview = disabled
+linter.prefer_rule_codes_in_output = false
 linter.explicit_preview_rules = false
 linter.extension = ExtensionMapping({})
 linter.allowed_confusables = []

crates/ruff/tests/cli/snapshots/cli__lint__requires_python_ruff_toml_above-2.snap

@@ -82,6 +82,7 @@ linter.safety_table.forced_unsafe = []
 linter.unresolved_target_version = none
 linter.per_file_target_version = {}
 linter.preview = disabled
+linter.prefer_rule_codes_in_output = false
 linter.explicit_preview_rules = false
 linter.extension = ExtensionMapping({})
 linter.allowed_confusables = []

crates/ruff/tests/cli/snapshots/cli__lint__requires_python_ruff_toml_above.snap

@@ -82,6 +82,7 @@ linter.safety_table.forced_unsafe = []
 linter.unresolved_target_version = none
 linter.per_file_target_version = {}
 linter.preview = disabled
+linter.prefer_rule_codes_in_output = false
 linter.explicit_preview_rules = false
 linter.extension = ExtensionMapping({})
 linter.allowed_confusables = []

crates/ruff/tests/cli/snapshots/cli__lint__requires_python_ruff_toml_no_target_fallback.snap

@@ -82,6 +82,7 @@ linter.safety_table.forced_unsafe = []
 linter.unresolved_target_version = 3.11
 linter.per_file_target_version = {}
 linter.preview = disabled
+linter.prefer_rule_codes_in_output = false
 linter.explicit_preview_rules = false
 linter.extension = ExtensionMapping({})
 linter.allowed_confusables = []

crates/ruff/tests/cli/snapshots/cli__show_settings__display_default_settings.snap

@@ -903,6 +903,7 @@ linter.safety_table.forced_unsafe = []
 linter.unresolved_target_version = 3.7
 linter.per_file_target_version = {}
 linter.preview = disabled
+linter.prefer_rule_codes_in_output = false
 linter.explicit_preview_rules = false
 linter.extension = ExtensionMapping({})
 linter.allowed_confusables = []

crates/ruff/tests/cli/snapshots/cli__show_settings__display_settings_from_nested_directory.snap

@@ -203,6 +203,7 @@ linter.safety_table.forced_unsafe = []
 linter.unresolved_target_version = none
 linter.per_file_target_version = {}
 linter.preview = disabled
+linter.prefer_rule_codes_in_output = false
 linter.explicit_preview_rules = false
 linter.extension = ExtensionMapping({})
 linter.allowed_confusables = []

crates/ruff_db/src/diagnostic/mod.rs

@@ -1431,6 +1431,8 @@ pub struct DisplayDiagnosticConfig {
     merge_window: usize,
     /// Whether to use preview formatting for Ruff diagnostics.
     preview: bool,
+    /// Whether to prefer rule codes over human-readable rule names in Ruff diagnostic output.
+    prefer_rule_codes: bool,
     /// Whether to hide the real `Severity` of diagnostics.
     ///
     /// This is intended for temporary use by Ruff, which only has a single `error` severity at the
@@ -1455,6 +1457,7 @@ impl DisplayDiagnosticConfig {
             context: 2,
             merge_window: 2,
             preview: false,
+            prefer_rule_codes: false,
             hide_severity: false,
             show_fix_status: false,
             fix_applicability: Applicability::Safe,
@@ -1519,6 +1522,19 @@ impl DisplayDiagnosticConfig {
         self.preview
     }
 
+    /// Whether to prefer rule codes over human-readable rule names, even in preview mode.
+    pub fn prefer_rule_codes(self, yes: bool) -> DisplayDiagnosticConfig {
+        DisplayDiagnosticConfig {
+            prefer_rule_codes: yes,
+            ..self
+        }
+    }
+
+    /// Whether rule codes are explicitly preferred over human-readable rule names.
+    pub fn prefer_rule_codes_enabled(&self) -> bool {
+        self.prefer_rule_codes
+    }
+
     /// Whether to hide a diagnostic's severity or not.
     pub fn hide_severity(self, yes: bool) -> DisplayDiagnosticConfig {
         DisplayDiagnosticConfig {

crates/ruff_db/src/diagnostic/render.rs

@@ -238,9 +238,8 @@ impl<'a> ResolvedDiagnostic<'a> {
             })
             .collect();
 
-        let id = if !config.preview
-            && let Some(code) = diag.secondary_code()
-        {
+        let use_code = !config.preview || config.prefer_rule_codes;
+        let id = if use_code && let Some(code) = diag.secondary_code() {
             code.to_string()
         } else if config.hide_severity {
             // When Ruff gets real severities, we should put the colon back in

crates/ruff_db/src/diagnostic/render/azure.rs

@@ -49,7 +49,7 @@ impl AzureRenderer<'_> {
                     )?;
                 }
             }
-            let code = if self.config.preview {
+            let code = if self.config.preview && !self.config.prefer_rule_codes {
                 diag.id().as_str()
             } else {
                 diag.secondary_code_or_id()

crates/ruff_db/src/diagnostic/render/concise.rs

@@ -67,10 +67,9 @@ impl<'a> ConciseRenderer<'a> {
                 write!(f, "{sep} ")?;
             }
 
+            let use_name = self.config.preview && !self.config.prefer_rule_codes;
             if self.config.hide_severity {
-                if !self.config.preview
-                    && let Some(code) = diag.secondary_code()
-                {
+                if !use_name && let Some(code) = diag.secondary_code() {
                     write!(
                         f,
                         "{code} ",
@@ -100,7 +99,7 @@ impl<'a> ConciseRenderer<'a> {
                     Severity::Error => ("error", stylesheet.error),
                     Severity::Fatal => ("fatal", stylesheet.error),
                 };
-                let id = if self.config.preview {
+                let id = if use_name {
                     diag.id().as_str()
                 } else {
                     diag.secondary_code_or_id()

crates/ruff_db/src/diagnostic/render/github.rs

@@ -26,7 +26,8 @@ impl<'a> GithubRenderer<'a> {
                 Severity::Warning => "warning",
                 Severity::Error | Severity::Fatal => "error",
             };
-            let code = if self.config.preview {
+            let use_name = self.config.preview && !self.config.prefer_rule_codes;
+            let code = if use_name {
                 diagnostic.id().as_str()
             } else {
                 diagnostic.secondary_code_or_id()
@@ -90,9 +91,7 @@ impl<'a> GithubRenderer<'a> {
                 write!(f, "::")?;
             }
 
-            if !self.config.preview
-                && let Some(code) = diagnostic.secondary_code()
-            {
+            if !use_name && let Some(code) = diagnostic.secondary_code() {
                 write!(f, "{code}")?;
             } else {
                 write!(f, "{id}:", id = diagnostic.id())?;

crates/ruff_db/src/diagnostic/render/gitlab.rs

@@ -102,7 +102,7 @@ impl Serialize for SerializedMessages<'_> {
             fingerprints.insert(message_fingerprint);
 
             let description = diagnostic.concise_message();
-            let check_name = if self.config.preview {
+            let check_name = if self.config.preview && !self.config.prefer_rule_codes {
                 diagnostic.id().as_str()
             } else {
                 diagnostic.secondary_code_or_id()

crates/ruff_db/src/diagnostic/render/junit.rs

@@ -58,7 +58,7 @@ impl<'a> JunitRenderer<'a> {
                         start_location: location,
                     } = diagnostic;
 
-                    let code = if self.config.preview {
+                    let code = if self.config.preview && !self.config.prefer_rule_codes {
                         diagnostic.id().as_str()
                     } else {
                         diagnostic.secondary_code_or_id()

crates/ruff_db/src/diagnostic/render/pylint.rs

@@ -46,7 +46,7 @@ impl PylintRenderer<'_> {
                 })
                 .unwrap_or_default();
 
-            let code = if self.config.preview {
+            let code = if self.config.preview && !self.config.prefer_rule_codes {
                 diagnostic.id().as_str()
             } else {
                 diagnostic.secondary_code_or_id()

crates/ruff_db/src/diagnostic/render/rdjson.rs

@@ -86,7 +86,7 @@ fn diagnostic_to_rdjson<'a>(
         message: diagnostic.concise_message(),
         location,
         code: RdjsonCode {
-            value: if config.preview {
+            value: if config.preview && !config.prefer_rule_codes {
                 diagnostic.id().as_str()
             } else {
                 diagnostic.secondary_code_or_id()