switch to secondary annotation

Author: ntBre

crates/ruff_db/src/diagnostic/mod.rs

@@ -497,16 +497,6 @@ impl Diagnostic {
             other.expect_range().start(),
         ))
     }
-
-    /// Sort this diagnostic's sub-diagnostics by descending severity.
-    ///
-    /// This is particularly helpful to move `help`-level sub-diagnostics to the end, after any
-    /// longer, `info`-level diagnostics.
-    pub fn sort_sub_diagnostics(&mut self) {
-        Arc::make_mut(&mut self.inner)
-            .subs
-            .sort_by_key(|sub| std::cmp::Reverse(sub.inner.severity));
-    }
 }
 
 #[derive(Debug, Clone, Eq, PartialEq, Hash, get_size2::GetSize)]

crates/ruff_linter/src/checkers/ast/mod.rs

@@ -28,9 +28,7 @@ use itertools::Itertools;
 use log::debug;
 use rustc_hash::{FxHashMap, FxHashSet};
 
-use ruff_db::diagnostic::{
-    Annotation, Diagnostic, IntoDiagnosticMessage, Span, SubDiagnostic, SubDiagnosticSeverity,
-};
+use ruff_db::diagnostic::{Annotation, Diagnostic, IntoDiagnosticMessage, Span};
 use ruff_diagnostics::{Applicability, Fix, IsolationLevel};
 use ruff_notebook::{CellOffsets, NotebookIndex};
 use ruff_python_ast::helpers::{collect_import_from_member, is_docstring_stmt, to_module_path};
@@ -3308,20 +3306,15 @@ impl DiagnosticGuard<'_, '_> {
         }
     }
 
-    /// Add an "info" sub-diagnostic with the given message and range.
-    ///
-    /// Note that this shadows `Diagnostic::info` from the `Deref` implementation because we'll
-    /// usually want to attach a range here.
-    pub(crate) fn info<'a>(
+    /// Add a secondary annotation with the given message and range.
+    pub(crate) fn secondary_annotation<'a>(
         &mut self,
         message: impl IntoDiagnosticMessage + 'a,
         range: impl Ranged,
     ) {
-        let mut sub = SubDiagnostic::new(SubDiagnosticSeverity::Info, message);
         let span = Span::from(self.context.source_file.clone()).with_range(range.range());
-        let ann = Annotation::primary(span);
-        sub.annotate(ann);
-        self.diagnostic.as_mut().unwrap().sub(sub);
+        let ann = Annotation::secondary(span).message(message);
+        self.diagnostic.as_mut().unwrap().annotate(ann);
     }
 }
 
@@ -3349,8 +3342,7 @@ impl Drop for DiagnosticGuard<'_, '_> {
             return;
         }
 
-        if let Some(mut diagnostic) = self.diagnostic.take() {
-            diagnostic.sort_sub_diagnostics();
+        if let Some(diagnostic) = self.diagnostic.take() {
             self.context.diagnostics.borrow_mut().push(diagnostic);
         }
     }

crates/ruff_linter/src/rules/pyflakes/rules/redefined_while_unused.rs

@@ -192,7 +192,7 @@ pub(crate) fn redefined_while_unused(checker: &Checker, scope_id: ScopeId, scope
                 binding.range(),
             );
 
-            diagnostic.info(
+            diagnostic.secondary_annotation(
                 format_args!("previous definition of `{name}` here"),
                 shadowed,
             );

crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F811_F811_0.py.snap

@@ -8,12 +8,11 @@ F811 Redefinition of unused `bar` from line 6
    |     ^^^
 11 |     pass
    |
-info: previous definition of `bar` here
- --> F811_0.py:6:5
-  |
-5 | @foo
-6 | def bar():
-  |     ^^^
-7 |     pass
-  |
+  ::: F811_0.py:6:5
+   |
+ 5 | @foo
+ 6 | def bar():
+   |     --- previous definition of `bar` here
+ 7 |     pass
+   |
 help: Remove definition: `bar`

crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F811_F811_1.py.snap

@@ -2,15 +2,11 @@
 source: crates/ruff_linter/src/rules/pyflakes/mod.rs
 ---
 F811 Redefinition of unused `FU` from line 1
- --> F811_1.py:1:25
-  |
-1 | import fu as FU, bar as FU
-  |                         ^^
-  |
-info: previous definition of `FU` here
  --> F811_1.py:1:14
   |
 1 | import fu as FU, bar as FU
-  |              ^^
+  |              --         ^^
+  |              |
+  |              previous definition of `FU` here
   |
 help: Remove definition: `FU`

crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F811_F811_12.py.snap

@@ -2,21 +2,16 @@
 source: crates/ruff_linter/src/rules/pyflakes/mod.rs
 ---
 F811 Redefinition of unused `mixer` from line 2
- --> F811_12.py:6:20
-  |
-4 |     pass
-5 | else:
-6 |     from bb import mixer
-  |                    ^^^^^
-7 | mixer(123)
-  |
-info: previous definition of `mixer` here
  --> F811_12.py:2:20
   |
 1 | try:
 2 |     from aa import mixer
-  |                    ^^^^^
+  |                    ----- previous definition of `mixer` here
 3 | except ImportError:
 4 |     pass
+5 | else:
+6 |     from bb import mixer
+  |                    ^^^^^
+7 | mixer(123)
   |
 help: Remove definition: `mixer`

crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F811_F811_15.py.snap

@@ -8,10 +8,9 @@ F811 Redefinition of unused `fu` from line 1
   |     ^^
 5 |     pass
   |
-info: previous definition of `fu` here
- --> F811_15.py:1:8
+ ::: F811_15.py:1:8
   |
 1 | import fu
-  |        ^^
+  |        -- previous definition of `fu` here
   |
 help: Remove definition: `fu`

crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F811_F811_16.py.snap

@@ -10,12 +10,11 @@ F811 Redefinition of unused `fu` from line 3
   |             ^^
 9 |             pass
   |
-info: previous definition of `fu` here
- --> F811_16.py:3:8
+ ::: F811_16.py:3:8
   |
 1 | """Test that shadowing a global with a nested function generates a warning."""
 2 |
 3 | import fu
-  |        ^^
+  |        -- previous definition of `fu` here
   |
 help: Remove definition: `fu`

crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F811_F811_17.py.snap

@@ -10,12 +10,11 @@ F811 [*] Redefinition of unused `fu` from line 2
 7 |
 8 |     def baz():
   |
-info: previous definition of `fu` here
- --> F811_17.py:2:8
+ ::: F811_17.py:2:8
   |
 1 | """Test that shadowing a global name with a nested function generates a warning."""
 2 | import fu
-  |        ^^
+  |        -- previous definition of `fu` here
   |
 help: Remove definition: `fu`
 
@@ -29,20 +28,15 @@ help: Remove definition: `fu`
 9 8 |         def fu():
 
 F811 Redefinition of unused `fu` from line 6
-  --> F811_17.py:9:13
+  --> F811_17.py:6:12
    |
+ 5 | def bar():
+ 6 |     import fu
+   |            -- previous definition of `fu` here
+ 7 |
  8 |     def baz():
  9 |         def fu():
    |             ^^
 10 |             pass
    |
-info: previous definition of `fu` here
- --> F811_17.py:6:12
-  |
-5 | def bar():
-6 |     import fu
-  |            ^^
-7 |
-8 |     def baz():
-  |
 help: Remove definition: `fu`

crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F811_F811_2.py.snap

@@ -2,15 +2,11 @@
 source: crates/ruff_linter/src/rules/pyflakes/mod.rs
 ---
 F811 Redefinition of unused `FU` from line 1
- --> F811_2.py:1:34
-  |
-1 | from moo import fu as FU, bar as FU
-  |                                  ^^
-  |
-info: previous definition of `FU` here
  --> F811_2.py:1:23
   |
 1 | from moo import fu as FU, bar as FU
-  |                       ^^
+  |                       --         ^^
+  |                       |
+  |                       previous definition of `FU` here
   |
 help: Remove definition: `FU`