Merge branch 'main' into alex/basic-liskov

Author: AlexWaygood

.github/workflows/ty-ecosystem-analyzer.yaml

@@ -67,7 +67,7 @@ jobs:
 
           cd ..
 
-          uv tool install "git+https://github.com/astral-sh/ecosystem-analyzer@11aa5472cf9d6b9e019c401505a093112942d7bf"
+          uv tool install "git+https://github.com/astral-sh/ecosystem-analyzer@0aff03414da5d242e97a9f43fb502e085637a4a1"
 
           ecosystem-analyzer \
             --repository ruff \

.github/workflows/ty-ecosystem-report.yaml

@@ -52,7 +52,7 @@ jobs:
 
           cd ..
 
-          uv tool install "git+https://github.com/astral-sh/ecosystem-analyzer@11aa5472cf9d6b9e019c401505a093112942d7bf"
+          uv tool install "git+https://github.com/astral-sh/ecosystem-analyzer@0aff03414da5d242e97a9f43fb502e085637a4a1"
 
           ecosystem-analyzer \
             --verbose \

crates/ruff_db/src/diagnostic/mod.rs

@@ -64,6 +64,7 @@ impl Diagnostic {
             id,
             severity,
             message: message.into_diagnostic_message(),
+            custom_concise_message: None,
             annotations: vec![],
             subs: vec![],
             fix: None,
@@ -213,6 +214,10 @@ impl Diagnostic {
     /// cases, just converting it to a string (or printing it) will do what
     /// you want.
     pub fn concise_message(&self) -> ConciseMessage<'_> {
+        if let Some(custom_message) = &self.inner.custom_concise_message {
+            return ConciseMessage::Custom(custom_message.as_str());
+        }
+
         let main = self.inner.message.as_str();
         let annotation = self
             .primary_annotation()
@@ -226,6 +231,15 @@ impl Diagnostic {
         }
     }
 
+    /// Set a custom message for the concise formatting of this diagnostic.
+    ///
+    /// This overrides the default behavior of generating a concise message
+    /// from the main diagnostic message and the primary annotation.
+    pub fn set_concise_message(&mut self, message: impl IntoDiagnosticMessage) {
+        Arc::make_mut(&mut self.inner).custom_concise_message =
+            Some(message.into_diagnostic_message());
+    }
+
     /// Returns the severity of this diagnostic.
     ///
     /// Note that this may be different than the severity of sub-diagnostics.
@@ -532,6 +546,7 @@ struct DiagnosticInner {
     id: DiagnosticId,
     severity: Severity,
     message: DiagnosticMessage,
+    custom_concise_message: Option<DiagnosticMessage>,
     annotations: Vec<Annotation>,
     subs: Vec<SubDiagnostic>,
     fix: Option<Fix>,
@@ -1520,6 +1535,8 @@ pub enum ConciseMessage<'a> {
     /// This indicates that the diagnostic is probably using the old
     /// model.
     Empty,
+    /// A custom concise message has been provided.
+    Custom(&'a str),
 }
 
 impl std::fmt::Display for ConciseMessage<'_> {
@@ -1535,6 +1552,9 @@ impl std::fmt::Display for ConciseMessage<'_> {
                 write!(f, "{main}: {annotation}")
             }
             ConciseMessage::Empty => Ok(()),
+            ConciseMessage::Custom(message) => {
+                write!(f, "{message}")
+            }
         }
     }
 }

crates/ruff_linter/resources/test/fixtures/ruff/RUF012.py

@@ -132,3 +132,9 @@ class AWithQuotes:
     final_variable: 'Final[list[int]]' = []
     class_variable_without_subscript: 'ClassVar' = []
     final_variable_without_subscript: 'Final' = []
+
+
+# Reassignment of a ClassVar should not trigger RUF012
+class P:
+    class_variable: ClassVar[list] = [10, 20, 30, 40, 50]
+    class_variable = [*class_variable[0::1], *class_variable[2::3]]

crates/ruff_linter/src/rules/ruff/rules/mutable_class_default.rs

@@ -1,6 +1,7 @@
-use ruff_python_ast::{self as ast, Stmt};
+use rustc_hash::FxHashSet;
 
 use ruff_macros::{ViolationMetadata, derive_message_formats};
+use ruff_python_ast::{self as ast, Stmt};
 use ruff_python_semantic::analyze::typing::{is_immutable_annotation, is_mutable_expr};
 use ruff_text_size::Ranged;
 
@@ -96,6 +97,9 @@ impl Violation for MutableClassDefault {
 
 /// RUF012
 pub(crate) fn mutable_class_default(checker: &Checker, class_def: &ast::StmtClassDef) {
+    // Collect any `ClassVar`s we find in case they get reassigned later.
+    let mut class_var_targets = FxHashSet::default();
+
     for statement in &class_def.body {
         match statement {
             Stmt::AnnAssign(ast::StmtAnnAssign {
@@ -104,6 +108,12 @@ pub(crate) fn mutable_class_default(checker: &Checker, class_def: &ast::StmtClas
                 value: Some(value),
                 ..
             }) => {
+                if let ast::Expr::Name(ast::ExprName { id, .. }) = target.as_ref() {
+                    if is_class_var_annotation(annotation, checker.semantic()) {
+                        class_var_targets.insert(id);
+                    }
+                }
+
                 if !is_special_attribute(target)
                     && is_mutable_expr(value, checker.semantic())
                     && !is_class_var_annotation(annotation, checker.semantic())
@@ -123,8 +133,12 @@ pub(crate) fn mutable_class_default(checker: &Checker, class_def: &ast::StmtClas
                 }
             }
             Stmt::Assign(ast::StmtAssign { value, targets, .. }) => {
-                if !targets.iter().all(is_special_attribute)
-                    && is_mutable_expr(value, checker.semantic())
+                if !targets.iter().all(|target| {
+                    is_special_attribute(target)
+                        || target
+                            .as_name_expr()
+                            .is_some_and(|name| class_var_targets.contains(&name.id))
+                }) && is_mutable_expr(value, checker.semantic())
                 {
                     // Avoid, e.g., Pydantic and msgspec models, which end up copying defaults on instance creation.
                     if has_default_copy_semantics(class_def, checker.semantic()) {

crates/ruff_python_formatter/resources/test/fixtures/ruff/expression/attribute.py

@@ -169,3 +169,53 @@
     # dangling before dot
     .b # trailing end-of-line
 )
+
+# Regression test for https://github.com/astral-sh/ruff/issues/19350
+variable = (
+    (something)  # a comment
+    .first_method("some string")
+)
+
+variable = (
+    something # a commentdddddddddddddddddddddddddddddd
+    .first_method("some string")
+)
+
+if (
+    (something)  # a commentdddddddddddddddddddddddddddddd
+    .first_method("some string")
+): pass
+
+variable = (
+    (something # a comment
+    ).first_method("some string")
+)
+
+if (
+    (something # a comment
+    ).first_method("some string") # second comment
+): pass
+
+variable = ( # 1
+    # 2
+    (something)  # 3
+    # 4
+    .first_method("some string") # 5
+    # 6
+) # 7
+
+
+if (
+    (something
+    # trailing own line on value
+    )
+    .first_method("some string")
+): ...
+
+variable = (
+    (something
+    # 1
+    )  # 2
+    .first_method("some string")
+)
+

crates/ruff_python_formatter/src/expression/expr_attribute.rs

@@ -179,7 +179,22 @@ impl NeedsParentheses for ExprAttribute {
             context.comments().ranges(),
             context.source(),
         ) {
-            OptionalParentheses::Never
+            // We have to avoid creating syntax errors like
+            // ```python
+            // variable = (something) # trailing
+            // .my_attribute
+            // ```
+            // See https://github.com/astral-sh/ruff/issues/19350
+            if context
+                .comments()
+                .trailing(self.value.as_ref())
+                .iter()
+                .any(|comment| comment.line_position().is_end_of_line())
+            {
+                OptionalParentheses::Multiline
+            } else {
+                OptionalParentheses::Never
+            }
         } else {
             self.value.needs_parentheses(self.into(), context)
         }

crates/ruff_python_formatter/tests/snapshots/format@expression__attribute.py.snap

@@ -175,6 +175,56 @@ result = (
     # dangling before dot
     .b # trailing end-of-line
 )
+
+# Regression test for https://github.com/astral-sh/ruff/issues/19350
+variable = (
+    (something)  # a comment
+    .first_method("some string")
+)
+
+variable = (
+    something # a commentdddddddddddddddddddddddddddddd
+    .first_method("some string")
+)
+
+if (
+    (something)  # a commentdddddddddddddddddddddddddddddd
+    .first_method("some string")
+): pass
+
+variable = (
+    (something # a comment
+    ).first_method("some string")
+)
+
+if (
+    (something # a comment
+    ).first_method("some string") # second comment
+): pass
+
+variable = ( # 1
+    # 2
+    (something)  # 3
+    # 4
+    .first_method("some string") # 5
+    # 6
+) # 7
+
+
+if (
+    (something
+    # trailing own line on value
+    )
+    .first_method("some string")
+): ...
+
+variable = (
+    (something
+    # 1
+    )  # 2
+    .first_method("some string")
+)
+
 ```
 
 ## Output
@@ -328,4 +378,54 @@ result = (
     # dangling before dot
     .b  # trailing end-of-line
 )
+
+# Regression test for https://github.com/astral-sh/ruff/issues/19350
+variable = (
+    (something)  # a comment
+    .first_method("some string")
+)
+
+variable = something.first_method(  # a commentdddddddddddddddddddddddddddddd
+    "some string"
+)
+
+if (
+    (something)  # a commentdddddddddddddddddddddddddddddd
+    .first_method("some string")
+):
+    pass
+
+variable = (
+    something  # a comment
+).first_method("some string")
+
+if (
+    (
+        something  # a comment
+    ).first_method("some string")  # second comment
+):
+    pass
+
+variable = (  # 1
+    # 2
+    (something)  # 3
+    # 4
+    .first_method("some string")  # 5
+    # 6
+)  # 7
+
+
+if (
+    something
+    # trailing own line on value
+).first_method("some string"):
+    ...
+
+variable = (
+    (
+        something
+        # 1
+    )  # 2
+    .first_method("some string")
+)
 ```

crates/ty/tests/cli/main.rs

@@ -41,22 +41,24 @@ fn test_quiet_output() -> anyhow::Result<()> {
     let case = CliTest::with_file("test.py", "x: int = 'foo'")?;
 
     // By default, we emit a diagnostic
-    assert_cmd_snapshot!(case.command(), @r###"
+    assert_cmd_snapshot!(case.command(), @r#"
     success: false
     exit_code: 1
     ----- stdout -----
     error[invalid-assignment]: Object of type `Literal["foo"]` is not assignable to `int`
-     --> test.py:1:1
+     --> test.py:1:4
       |
     1 | x: int = 'foo'
-      | ^
+      |    ---   ^^^^^ Incompatible value of type `Literal["foo"]`
+      |    |
+      |    Declared type
       |
     info: rule `invalid-assignment` is enabled by default
 
     Found 1 diagnostic
 
     ----- stderr -----
-    "###);
+    "#);
 
     // With `quiet`, the diagnostic is not displayed, just the summary message
     assert_cmd_snapshot!(case.command().arg("--quiet"), @r"