[ty] Cache legacy generic context

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

@@ -67,7 +67,7 @@ jobs:
 
           cd ..
 
-          uv tool install "git+https://github.com/astral-sh/ecosystem-analyzer@2e1816eac09c90140b1ba51d19afc5f59da460f5"
+          uv tool install "git+https://github.com/astral-sh/ecosystem-analyzer@55df3c868f3fa9ab34cff0498dd6106722aac205"
 
           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@2e1816eac09c90140b1ba51d19afc5f59da460f5"
+          uv tool install "git+https://github.com/astral-sh/ecosystem-analyzer@55df3c868f3fa9ab34cff0498dd6106722aac205"
 
           ecosystem-analyzer \
             --verbose \

CHANGELOG.md

@@ -1,54 +1,5 @@
 # Changelog
 
-## 0.14.10
-
-Released on 2025-12-18.
-
-### Preview features
-
-- [formatter] Fluent formatting of method chains ([#21369](https://github.com/astral-sh/ruff/pull/21369))
-- [formatter] Keep lambda parameters on one line and parenthesize the body if it expands ([#21385](https://github.com/astral-sh/ruff/pull/21385))
-- \[`flake8-implicit-str-concat`\] New rule to prevent implicit string concatenation in collections (`ISC004`) ([#21972](https://github.com/astral-sh/ruff/pull/21972))
-- \[`flake8-use-pathlib`\] Make fixes unsafe when types change in compound statements (`PTH104`, `PTH105`, `PTH109`, `PTH115`) ([#22009](https://github.com/astral-sh/ruff/pull/22009))
-- \[`refurb`\] Extend support for `Path.open` (`FURB101`, `FURB103`) ([#21080](https://github.com/astral-sh/ruff/pull/21080))
-
-### Bug fixes
-
-- \[`pyupgrade`\] Fix parsing named Unicode escape sequences (`UP032`) ([#21901](https://github.com/astral-sh/ruff/pull/21901))
-
-### Rule changes
-
-- \[`eradicate`\] Ignore `ruff:disable` and `ruff:enable` comments in `ERA001` ([#22038](https://github.com/astral-sh/ruff/pull/22038))
-- \[`flake8-pytest-style`\] Allow `match` and `check` keyword arguments without an expected exception type (`PT010`) ([#21964](https://github.com/astral-sh/ruff/pull/21964))
-- [syntax-errors] Annotated name cannot be global ([#20868](https://github.com/astral-sh/ruff/pull/20868))
-
-### Documentation
-
-- Add `uv` and `ty` to the Ruff README ([#21996](https://github.com/astral-sh/ruff/pull/21996))
-- Document known lambda formatting deviations from Black ([#21954](https://github.com/astral-sh/ruff/pull/21954))
-- Update `setup.md` ([#22024](https://github.com/astral-sh/ruff/pull/22024))
-- \[`flake8-bandit`\] Fix broken link (`S704`) ([#22039](https://github.com/astral-sh/ruff/pull/22039))
-
-### Other changes
-
-- Fix playground Share button showing "Copied!" before clipboard copy completes ([#21942](https://github.com/astral-sh/ruff/pull/21942))
-
-### Contributors
-
-- [@dylwil3](https://github.com/dylwil3)
-- [@charliecloudberry](https://github.com/charliecloudberry)
-- [@charliermarsh](https://github.com/charliermarsh)
-- [@chirizxc](https://github.com/chirizxc)
-- [@ntBre](https://github.com/ntBre)
-- [@zanieb](https://github.com/zanieb)
-- [@amyreese](https://github.com/amyreese)
-- [@hauntsaninja](https://github.com/hauntsaninja)
-- [@11happy](https://github.com/11happy)
-- [@mahiro72](https://github.com/mahiro72)
-- [@MichaReiser](https://github.com/MichaReiser)
-- [@phongddo](https://github.com/phongddo)
-- [@PeterJCLaw](https://github.com/PeterJCLaw)
-
 ## 0.14.9
 
 Released on 2025-12-11.

Cargo.lock

@@ -1004,6 +1004,27 @@ dependencies = [
  "crypto-common",
 ]
 
+[[package]]
+name = "dir-test"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62c013fe825864f3e4593f36426c1fa7a74f5603f13ca8d1af7a990c1cd94a79"
+dependencies = [
+ "dir-test-macros",
+]
+
+[[package]]
+name = "dir-test-macros"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d42f54d7b4a6bc2400fe5b338e35d1a335787585375322f49c5d5fe7b243da7e"
+dependencies = [
+ "glob",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "dirs"
 version = "6.0.0"
@@ -2887,7 +2908,7 @@ dependencies = [
 
 [[package]]
 name = "ruff"
-version = "0.14.10"
+version = "0.14.9"
 dependencies = [
  "anyhow",
  "argfile",
@@ -3145,7 +3166,7 @@ dependencies = [
 
 [[package]]
 name = "ruff_linter"
-version = "0.14.10"
+version = "0.14.9"
 dependencies = [
  "aho-corasick",
  "anyhow",
@@ -3504,7 +3525,7 @@ dependencies = [
 
 [[package]]
 name = "ruff_wasm"
-version = "0.14.10"
+version = "0.14.9"
 dependencies = [
  "console_error_panic_hook",
  "console_log",
@@ -4492,7 +4513,7 @@ dependencies = [
  "camino",
  "colored 3.0.0",
  "compact_str",
- "datatest-stable",
+ "dir-test",
  "drop_bomb",
  "get-size2",
  "glob",

Cargo.toml

@@ -82,6 +82,7 @@ criterion = { version = "0.7.0", default-features = false }
 crossbeam = { version = "0.8.4" }
 dashmap = { version = "6.0.1" }
 datatest-stable = { version = "0.3.3" }
+dir-test = { version = "0.4.0" }
 dunce = { version = "1.0.5" }
 drop_bomb = { version = "0.1.5" }
 etcetera = { version = "0.11.0" }

README.md

@@ -57,11 +57,8 @@ Ruff is extremely actively developed and used in major open-source projects like
 
 ...and [many more](#whos-using-ruff).
 
-Ruff is backed by [Astral](https://astral.sh), the creators of
-[uv](https://github.com/astral-sh/uv) and [ty](https://github.com/astral-sh/ty).
-
-Read the [launch post](https://astral.sh/blog/announcing-astral-the-company-behind-ruff), or the
-original [project announcement](https://notes.crmarsh.com/python-tooling-could-be-much-much-faster).
+Ruff is backed by [Astral](https://astral.sh). Read the [launch post](https://astral.sh/blog/announcing-astral-the-company-behind-ruff),
+or the original [project announcement](https://notes.crmarsh.com/python-tooling-could-be-much-much-faster).
 
 ## Testimonials
 
@@ -150,8 +147,8 @@ curl -LsSf https://astral.sh/ruff/install.sh | sh
 powershell -c "irm https://astral.sh/ruff/install.ps1 | iex"
 
 # For a specific version.
-curl -LsSf https://astral.sh/ruff/0.14.10/install.sh | sh
-powershell -c "irm https://astral.sh/ruff/0.14.10/install.ps1 | iex"
+curl -LsSf https://astral.sh/ruff/0.14.9/install.sh | sh
+powershell -c "irm https://astral.sh/ruff/0.14.9/install.ps1 | iex"
 ```
 
 You can also install Ruff via [Homebrew](https://formulae.brew.sh/formula/ruff), [Conda](https://anaconda.org/conda-forge/ruff),
@@ -184,7 +181,7 @@ Ruff can also be used as a [pre-commit](https://pre-commit.com/) hook via [`ruff
 ```yaml
 - repo: https://github.com/astral-sh/ruff-pre-commit
   # Ruff version.
-  rev: v0.14.10
+  rev: v0.14.9
   hooks:
     # Run the linter.
     - id: ruff-check

_typos.toml

@@ -4,7 +4,6 @@ extend-exclude = [
     "crates/ty_vendored/vendor/**/*",
     "**/resources/**/*",
     "**/snapshots/**/*",
-    "crates/ruff_linter/src/rules/flake8_implicit_str_concat/rules/collection_literal.rs",
     # Completion tests tend to have a lot of incomplete
     # words naturally. It's annoying to have to make all
     # of them actually words. So just ignore typos here.

crates/ruff/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ruff"
-version = "0.14.10"
+version = "0.14.9"
 publish = true
 authors = { workspace = true }
 edition = { workspace = true }

crates/ruff_benchmark/benches/ty_walltime.rs

@@ -194,7 +194,7 @@ static SYMPY: Benchmark = Benchmark::new(
         max_dep_date: "2025-06-17",
         python_version: PythonVersion::PY312,
     },
-    13100,
+    13030,
 );
 
 static TANJUN: Benchmark = Benchmark::new(
@@ -223,7 +223,7 @@ static STATIC_FRAME: Benchmark = Benchmark::new(
         max_dep_date: "2025-08-09",
         python_version: PythonVersion::PY311,
     },
-    1100,
+    950,
 );
 
 #[track_caller]

crates/ruff_db/src/system/test.rs

@@ -1,6 +1,5 @@
 use glob::PatternError;
 use ruff_notebook::{Notebook, NotebookError};
-use rustc_hash::FxHashMap;
 use std::panic::RefUnwindSafe;
 use std::sync::{Arc, Mutex};
 
@@ -21,44 +20,18 @@ use super::walk_directory::WalkDirectoryBuilder;
 ///
 /// ## Warning
 /// Don't use this system for production code. It's intended for testing only.
-#[derive(Debug)]
+#[derive(Debug, Clone)]
 pub struct TestSystem {
     inner: Arc<dyn WritableSystem + RefUnwindSafe + Send + Sync>,
-    /// Environment variable overrides. If a key is present here, it takes precedence
-    /// over the inner system's environment variables.
-    env_overrides: Arc<Mutex<FxHashMap<String, Option<String>>>>,
-}
-
-impl Clone for TestSystem {
-    fn clone(&self) -> Self {
-        Self {
-            inner: self.inner.clone(),
-            env_overrides: self.env_overrides.clone(),
-        }
-    }
 }
 
 impl TestSystem {
     pub fn new(inner: impl WritableSystem + RefUnwindSafe + Send + Sync + 'static) -> Self {
         Self {
             inner: Arc::new(inner),
-            env_overrides: Arc::new(Mutex::new(FxHashMap::default())),
         }
     }
 
-    /// Sets an environment variable override. This takes precedence over the inner system.
-    pub fn set_env_var(&self, name: impl Into<String>, value: impl Into<String>) {
-        self.env_overrides
-            .lock()
-            .unwrap()
-            .insert(name.into(), Some(value.into()));
-    }
-
-    /// Removes an environment variable override, making it appear as not set.
-    pub fn remove_env_var(&self, name: impl Into<String>) {
-        self.env_overrides.lock().unwrap().insert(name.into(), None);
-    }
-
     /// Returns the [`InMemorySystem`].
     ///
     /// ## Panics
@@ -174,18 +147,6 @@ impl System for TestSystem {
         self.system().case_sensitivity()
     }
 
-    fn env_var(&self, name: &str) -> std::result::Result<String, std::env::VarError> {
-        // Check overrides first
-        if let Some(override_value) = self.env_overrides.lock().unwrap().get(name) {
-            return match override_value {
-                Some(value) => Ok(value.clone()),
-                None => Err(std::env::VarError::NotPresent),
-            };
-        }
-        // Fall back to inner system
-        self.system().env_var(name)
-    }
-
     fn dyn_clone(&self) -> Box<dyn System> {
         Box::new(self.clone())
     }
@@ -195,7 +156,6 @@ impl Default for TestSystem {
     fn default() -> Self {
         Self {
             inner: Arc::new(InMemorySystem::default()),
-            env_overrides: Arc::new(Mutex::new(FxHashMap::default())),
         }
     }
 }

crates/ruff_linter/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ruff_linter"
-version = "0.14.10"
+version = "0.14.9"
 publish = false
 authors = { workspace = true }
 edition = { workspace = true }

crates/ruff_linter/resources/test/fixtures/flake8_implicit_str_concat/ISC004.py

@@ -1,66 +0,0 @@
-facts = (
-    "Lobsters have blue blood.",
-    "The liver is the only human organ that can fully regenerate itself.",
-    "Clarinets are made almost entirely out of wood from the mpingo tree."
-    "In 1971, astronaut Alan Shepard played golf on the moon.",
-)
-
-facts = [
-    "Lobsters have blue blood.",
-    "The liver is the only human organ that can fully regenerate itself.",
-    "Clarinets are made almost entirely out of wood from the mpingo tree."
-    "In 1971, astronaut Alan Shepard played golf on the moon.",
-]
-
-facts = {
-    "Lobsters have blue blood.",
-    "The liver is the only human organ that can fully regenerate itself.",
-    "Clarinets are made almost entirely out of wood from the mpingo tree."
-    "In 1971, astronaut Alan Shepard played golf on the moon.",
-}
-
-facts = {
-    (
-        "Clarinets are made almost entirely out of wood from the mpingo tree."
-        "In 1971, astronaut Alan Shepard played golf on the moon."
-    ),
-}
-
-facts = (
-    "Octopuses have three hearts."
-    # Missing comma here.
-    "Honey never spoils.",
-)
-
-facts = [
-    "Octopuses have three hearts."
-    # Missing comma here.
-    "Honey never spoils.",
-]
-
-facts = {
-    "Octopuses have three hearts."
-    # Missing comma here.
-    "Honey never spoils.",
-}
-
-facts = (
-    (
-        "Clarinets are made almost entirely out of wood from the mpingo tree."
-        "In 1971, astronaut Alan Shepard played golf on the moon."
-    ),
-)
-
-facts = [
-    (
-        "Clarinets are made almost entirely out of wood from the mpingo tree."
-        "In 1971, astronaut Alan Shepard played golf on the moon."
-    ),
-]
-
-facts = (
-    "Lobsters have blue blood.\n"
-    "The liver is the only human organ that can fully regenerate itself.\n"
-    "Clarinets are made almost entirely out of wood from the mpingo tree.\n"
-    "In 1971, astronaut Alan Shepard played golf on the moon.\n"
-)

crates/ruff_linter/resources/test/fixtures/flake8_pytest_style/PT010.py

@@ -9,15 +9,3 @@ def test_ok():
 def test_error():
     with pytest.raises(UnicodeError):
         pass
-
-def test_match_only():
-    with pytest.raises(match="some error message"):
-        pass
-
-def test_check_only():
-    with pytest.raises(check=lambda e: True):
-        pass
-
-def test_match_and_check():
-    with pytest.raises(match="some error message", check=lambda e: True):
-        pass

crates/ruff_linter/resources/test/fixtures/flake8_use_pathlib/full_name.py

@@ -136,38 +136,4 @@ os.chmod("pth1_file", 0o700, None, True, 1, *[1], **{"x": 1}, foo=1)
 os.rename("pth1_file", "pth1_file1", None, None, 1, *[1], **{"x": 1}, foo=1)
 os.replace("pth1_file1", "pth1_file", None, None, 1, *[1], **{"x": 1}, foo=1)
 
-os.path.samefile("pth1_file", "pth1_link", 1, *[1], **{"x": 1}, foo=1)
-
-# See: https://github.com/astral-sh/ruff/issues/21794
-import sys
-
-if os.rename("pth1.py", "pth1.py.bak"):
-    print("rename: truthy")
-else:
-    print("rename: falsey")
-
-if os.replace("pth1.py.bak", "pth1.py"):
-    print("replace: truthy")
-else:
-    print("replace: falsey")
-
-try:
-    for _ in os.getcwd():
-        print("getcwd: iterable")
-        break
-except TypeError as e:
-    print("getcwd: not iterable")
-
-try:
-    for _ in os.getcwdb():
-        print("getcwdb: iterable")
-        break
-except TypeError as e:
-    print("getcwdb: not iterable")
-
-try:
-    for _ in os.readlink(sys.executable):
-        print("readlink: iterable")
-        break
-except TypeError as e:
-    print("readlink: not iterable")
+os.path.samefile("pth1_file", "pth1_link", 1, *[1], **{"x": 1}, foo=1)

crates/ruff_linter/resources/test/fixtures/pyupgrade/UP032_0.py

@@ -132,6 +132,7 @@ async def c():
 # Non-errors
 ###
 
+# False-negative: RustPython doesn't parse the `\N{snowman}`.
 "\N{snowman} {}".format(a)
 
 "{".format(a)
@@ -275,6 +276,3 @@ if __name__ == "__main__":
     number = 0
     string = "{}".format(number := number + 1)
     print(string)
-
-# Unicode escape
-"\N{angle}AOB = {angle}°".format(angle=180)

crates/ruff_linter/resources/test/fixtures/refurb/FURB101.py

@@ -138,6 +138,5 @@ with open("file.txt", encoding="utf-8") as f:
 with open("file.txt", encoding="utf-8") as f:
     contents = process_contents(f.read())
 
-with open("file1.txt", encoding="utf-8") as f:
+with open("file.txt", encoding="utf-8") as f:
     contents: str = process_contents(f.read())
-

crates/ruff_linter/resources/test/fixtures/refurb/FURB101_1.py

@@ -1,8 +0,0 @@
-
-from pathlib import Path
-
-with Path("file.txt").open() as f:
-    contents = f.read()
-
-with Path("file.txt").open("r") as f:
-    contents = f.read()

crates/ruff_linter/resources/test/fixtures/refurb/FURB103_1.py

@@ -1,26 +0,0 @@
-from pathlib import Path
-
-with Path("file.txt").open("w") as f:
-    f.write("test")
-
-with Path("file.txt").open("wb") as f:
-    f.write(b"test")
-
-with Path("file.txt").open(mode="w") as f:
-    f.write("test")
-
-with Path("file.txt").open("w", encoding="utf8") as f:
-    f.write("test")
-
-with Path("file.txt").open("w", errors="ignore") as f:
-    f.write("test")
-
-with Path(foo()).open("w") as f:
-    f.write("test")
-
-p = Path("file.txt")
-with p.open("w") as f:
-    f.write("test")
-
-with Path("foo", "bar", "baz").open("w") as f:
-    f.write("test")

crates/ruff_linter/resources/test/fixtures/semantic_errors/annotated_global.py

@@ -1,38 +0,0 @@
-a: int = 1
-def f1():
-    global a
-    a: str = "foo"  # error
-
-b: int = 1
-def outer():
-    def inner():
-        global b
-        b: str = "nested"  # error
-
-c: int = 1
-def f2():
-    global c
-    c: list[str] = []  # error
-
-d: int = 1
-def f3():
-    global d
-    d: str  # error
-
-e: int = 1
-def f4():
-    e: str = "happy"  # okay
-
-global f
-f: int = 1  # okay
-
-g: int = 1
-global g  # error
-
-class C:
-    x: str
-    global x  # error
-
-class D:
-    global x  # error
-    x: str

crates/ruff_linter/src/checkers/ast/analyze/expression.rs

@@ -214,13 +214,6 @@ pub(crate) fn expression(expr: &Expr, checker: &Checker) {
             range: _,
             node_index: _,
         }) => {
-            if checker.is_rule_enabled(Rule::ImplicitStringConcatenationInCollectionLiteral) {
-                flake8_implicit_str_concat::rules::implicit_string_concatenation_in_collection_literal(
-                    checker,
-                    expr,
-                    elts,
-                );
-            }
             if ctx.is_store() {
                 let check_too_many_expressions =
                     checker.is_rule_enabled(Rule::ExpressionsInStarAssignment);
@@ -1336,13 +1329,6 @@ pub(crate) fn expression(expr: &Expr, checker: &Checker) {
             }
         }
         Expr::Set(set) => {
-            if checker.is_rule_enabled(Rule::ImplicitStringConcatenationInCollectionLiteral) {
-                flake8_implicit_str_concat::rules::implicit_string_concatenation_in_collection_literal(
-                    checker,
-                    expr,
-                    &set.elts,
-                );
-            }
             if checker.is_rule_enabled(Rule::DuplicateValue) {
                 flake8_bugbear::rules::duplicate_value(checker, set);
             }

crates/ruff_linter/src/codes.rs

@@ -454,7 +454,6 @@ pub fn code_to_rule(linter: Linter, code: &str) -> Option<(RuleGroup, Rule)> {
         (Flake8ImplicitStrConcat, "001") => rules::flake8_implicit_str_concat::rules::SingleLineImplicitStringConcatenation,
         (Flake8ImplicitStrConcat, "002") => rules::flake8_implicit_str_concat::rules::MultiLineImplicitStringConcatenation,
         (Flake8ImplicitStrConcat, "003") => rules::flake8_implicit_str_concat::rules::ExplicitStringConcatenation,
-        (Flake8ImplicitStrConcat, "004") => rules::flake8_implicit_str_concat::rules::ImplicitStringConcatenationInCollectionLiteral,
 
         // flake8-print
         (Flake8Print, "1") => rules::flake8_print::rules::Print,

crates/ruff_linter/src/linter.rs

@@ -1001,7 +1001,6 @@ mod tests {
     #[test_case(Path::new("write_to_debug.py"), PythonVersion::PY310)]
     #[test_case(Path::new("invalid_expression.py"), PythonVersion::PY312)]
     #[test_case(Path::new("global_parameter.py"), PythonVersion::PY310)]
-    #[test_case(Path::new("annotated_global.py"), PythonVersion::PY314)]
     fn test_semantic_errors(path: &Path, python_version: PythonVersion) -> Result<()> {
         let snapshot = format!(
             "semantic_syntax_error_{}_{}",

crates/ruff_linter/src/rules/eradicate/detection.rs

@@ -22,7 +22,6 @@ static ALLOWLIST_REGEX: LazyLock<Regex> = LazyLock::new(|| {
             # Case-sensitive
             pyright
         |   pyrefly
-        |   ruff\s*:\s*(disable|enable)
         |   mypy:
         |   type:\s*ignore
         |   SPDX-License-Identifier:
@@ -149,8 +148,6 @@ mod tests {
         assert!(!comment_contains_code("# 123", &[]));
         assert!(!comment_contains_code("# 123.1", &[]));
         assert!(!comment_contains_code("# 1, 2, 3", &[]));
-        assert!(!comment_contains_code("# ruff: disable[E501]", &[]));
-        assert!(!comment_contains_code("#ruff:enable[E501, F84]", &[]));
         assert!(!comment_contains_code(
             "# pylint: disable=redefined-outer-name",
             &[]

crates/ruff_linter/src/rules/flake8_async/rules/blocking_open_call.rs

@@ -70,7 +70,7 @@ fn is_open_call(func: &Expr, semantic: &SemanticModel) -> bool {
 }
 
 /// Returns `true` if an expression resolves to a call to `pathlib.Path.open`.
-pub(crate) fn is_open_call_from_pathlib(func: &Expr, semantic: &SemanticModel) -> bool {
+fn is_open_call_from_pathlib(func: &Expr, semantic: &SemanticModel) -> bool {
     let Expr::Attribute(ast::ExprAttribute { attr, value, .. }) = func else {
         return false;
     };

crates/ruff_linter/src/rules/flake8_async/rules/mod.rs

@@ -18,7 +18,7 @@ mod async_zero_sleep;
 mod blocking_http_call;
 mod blocking_http_call_httpx;
 mod blocking_input;
-pub(crate) mod blocking_open_call;
+mod blocking_open_call;
 mod blocking_path_methods;
 mod blocking_process_invocation;
 mod blocking_sleep;

crates/ruff_linter/src/rules/flake8_bandit/rules/unsafe_markup_use.rs

@@ -12,7 +12,7 @@ use crate::{checkers::ast::Checker, settings::LinterSettings};
 /// Checks for non-literal strings being passed to [`markupsafe.Markup`][markupsafe-markup].
 ///
 /// ## Why is this bad?
-/// [`markupsafe.Markup`][markupsafe-markup] does not perform any escaping, so passing dynamic
+/// [`markupsafe.Markup`] does not perform any escaping, so passing dynamic
 /// content, like f-strings, variables or interpolated strings will potentially
 /// lead to XSS vulnerabilities.
 ///

crates/ruff_linter/src/rules/flake8_implicit_str_concat/mod.rs

@@ -32,10 +32,6 @@ mod tests {
         Path::new("ISC_syntax_error_2.py")
     )]
     #[test_case(Rule::ExplicitStringConcatenation, Path::new("ISC.py"))]
-    #[test_case(
-        Rule::ImplicitStringConcatenationInCollectionLiteral,
-        Path::new("ISC004.py")
-    )]
     fn rules(rule_code: Rule, path: &Path) -> Result<()> {
         let snapshot = format!("{}_{}", rule_code.noqa_code(), path.to_string_lossy());
         let diagnostics = test_path(

crates/ruff_linter/src/rules/flake8_implicit_str_concat/rules/collection_literal.rs

@@ -1,103 +0,0 @@
-use ruff_macros::{ViolationMetadata, derive_message_formats};
-use ruff_python_ast::token::parenthesized_range;
-use ruff_python_ast::{Expr, StringLike};
-use ruff_text_size::Ranged;
-
-use crate::checkers::ast::Checker;
-use crate::{Edit, Fix, FixAvailability, Violation};
-
-/// ## What it does
-/// Checks for implicitly concatenated strings inside list, tuple, and set literals.
-///
-/// ## Why is this bad?
-/// In collection literals, implicit string concatenation is often the result of
-/// a missing comma between elements, which can silently merge items together.
-///
-/// ## Example
-/// ```python
-/// facts = (
-///     "Lobsters have blue blood.",
-///     "The liver is the only human organ that can fully regenerate itself.",
-///     "Clarinets are made almost entirely out of wood from the mpingo tree."
-///     "In 1971, astronaut Alan Shepard played golf on the moon.",
-/// )
-/// ```
-///
-/// Instead, you likely intended:
-/// ```python
-/// facts = (
-///     "Lobsters have blue blood.",
-///     "The liver is the only human organ that can fully regenerate itself.",
-///     "Clarinets are made almost entirely out of wood from the mpingo tree.",
-///     "In 1971, astronaut Alan Shepard played golf on the moon.",
-/// )
-/// ```
-///
-/// If the concatenation is intentional, wrap it in parentheses to make it
-/// explicit:
-/// ```python
-/// facts = (
-///     "Lobsters have blue blood.",
-///     "The liver is the only human organ that can fully regenerate itself.",
-///     (
-///         "Clarinets are made almost entirely out of wood from the mpingo tree."
-///         "In 1971, astronaut Alan Shepard played golf on the moon."
-///     ),
-/// )
-/// ```
-///
-/// ## Fix safety
-/// The fix is safe in that it does not change the semantics of your code.
-/// However, the issue is that you may often want to change semantics
-/// by adding a missing comma.
-#[derive(ViolationMetadata)]
-#[violation_metadata(preview_since = "0.14.10")]
-pub(crate) struct ImplicitStringConcatenationInCollectionLiteral;
-
-impl Violation for ImplicitStringConcatenationInCollectionLiteral {
-    const FIX_AVAILABILITY: FixAvailability = FixAvailability::Always;
-
-    #[derive_message_formats]
-    fn message(&self) -> String {
-        "Unparenthesized implicit string concatenation in collection".to_string()
-    }
-
-    fn fix_title(&self) -> Option<String> {
-        Some("Wrap implicitly concatenated strings in parentheses".to_string())
-    }
-}
-
-/// ISC004
-pub(crate) fn implicit_string_concatenation_in_collection_literal(
-    checker: &Checker,
-    expr: &Expr,
-    elements: &[Expr],
-) {
-    for element in elements {
-        let Ok(string_like) = StringLike::try_from(element) else {
-            continue;
-        };
-        if !string_like.is_implicit_concatenated() {
-            continue;
-        }
-        if parenthesized_range(
-            string_like.as_expression_ref(),
-            expr.into(),
-            checker.tokens(),
-        )
-        .is_some()
-        {
-            continue;
-        }
-
-        let mut diagnostic = checker.report_diagnostic(
-            ImplicitStringConcatenationInCollectionLiteral,
-            string_like.range(),
-        );
-        diagnostic.help("Did you forget a comma?");
-        diagnostic.set_fix(Fix::unsafe_edits(
-            Edit::insertion("(".to_string(), string_like.range().start()),
-            [Edit::insertion(")".to_string(), string_like.range().end())],
-        ));
-    }
-}

crates/ruff_linter/src/rules/flake8_implicit_str_concat/rules/mod.rs

@@ -1,7 +1,5 @@
-pub(crate) use collection_literal::*;
 pub(crate) use explicit::*;
 pub(crate) use implicit::*;
 
-mod collection_literal;
 mod explicit;
 mod implicit;

crates/ruff_linter/src/rules/flake8_implicit_str_concat/snapshots/ruff_linter__rules__flake8_implicit_str_concat__tests__ISC004_ISC004.py.snap

@@ -1,149 +0,0 @@
----
-source: crates/ruff_linter/src/rules/flake8_implicit_str_concat/mod.rs
----
-ISC004 [*] Unparenthesized implicit string concatenation in collection
- --> ISC004.py:4:5
-  |
-2 |       "Lobsters have blue blood.",
-3 |       "The liver is the only human organ that can fully regenerate itself.",
-4 | /     "Clarinets are made almost entirely out of wood from the mpingo tree."
-5 | |     "In 1971, astronaut Alan Shepard played golf on the moon.",
-  | |______________________________________________________________^
-6 |   )
-  |
-help: Wrap implicitly concatenated strings in parentheses
-help: Did you forget a comma?
-1 | facts = (
-2 |     "Lobsters have blue blood.",
-3 |     "The liver is the only human organ that can fully regenerate itself.",
-  -     "Clarinets are made almost entirely out of wood from the mpingo tree."
-  -     "In 1971, astronaut Alan Shepard played golf on the moon.",
-4 +     ("Clarinets are made almost entirely out of wood from the mpingo tree."
-5 +     "In 1971, astronaut Alan Shepard played golf on the moon."),
-6 | )
-7 | 
-8 | facts = [
-note: This is an unsafe fix and may change runtime behavior
-
-ISC004 [*] Unparenthesized implicit string concatenation in collection
-  --> ISC004.py:11:5
-   |
- 9 |       "Lobsters have blue blood.",
-10 |       "The liver is the only human organ that can fully regenerate itself.",
-11 | /     "Clarinets are made almost entirely out of wood from the mpingo tree."
-12 | |     "In 1971, astronaut Alan Shepard played golf on the moon.",
-   | |______________________________________________________________^
-13 |   ]
-   |
-help: Wrap implicitly concatenated strings in parentheses
-help: Did you forget a comma?
-8  | facts = [
-9  |     "Lobsters have blue blood.",
-10 |     "The liver is the only human organ that can fully regenerate itself.",
-   -     "Clarinets are made almost entirely out of wood from the mpingo tree."
-   -     "In 1971, astronaut Alan Shepard played golf on the moon.",
-11 +     ("Clarinets are made almost entirely out of wood from the mpingo tree."
-12 +     "In 1971, astronaut Alan Shepard played golf on the moon."),
-13 | ]
-14 | 
-15 | facts = {
-note: This is an unsafe fix and may change runtime behavior
-
-ISC004 [*] Unparenthesized implicit string concatenation in collection
-  --> ISC004.py:18:5
-   |
-16 |       "Lobsters have blue blood.",
-17 |       "The liver is the only human organ that can fully regenerate itself.",
-18 | /     "Clarinets are made almost entirely out of wood from the mpingo tree."
-19 | |     "In 1971, astronaut Alan Shepard played golf on the moon.",
-   | |______________________________________________________________^
-20 |   }
-   |
-help: Wrap implicitly concatenated strings in parentheses
-help: Did you forget a comma?
-15 | facts = {
-16 |     "Lobsters have blue blood.",
-17 |     "The liver is the only human organ that can fully regenerate itself.",
-   -     "Clarinets are made almost entirely out of wood from the mpingo tree."
-   -     "In 1971, astronaut Alan Shepard played golf on the moon.",
-18 +     ("Clarinets are made almost entirely out of wood from the mpingo tree."
-19 +     "In 1971, astronaut Alan Shepard played golf on the moon."),
-20 | }
-21 | 
-22 | facts = {
-note: This is an unsafe fix and may change runtime behavior
-
-ISC004 [*] Unparenthesized implicit string concatenation in collection
-  --> ISC004.py:30:5
-   |
-29 |   facts = (
-30 | /     "Octopuses have three hearts."
-31 | |     # Missing comma here.
-32 | |     "Honey never spoils.",
-   | |_________________________^
-33 |   )
-   |
-help: Wrap implicitly concatenated strings in parentheses
-help: Did you forget a comma?
-27 | }
-28 | 
-29 | facts = (
-   -     "Octopuses have three hearts."
-30 +     ("Octopuses have three hearts."
-31 |     # Missing comma here.
-   -     "Honey never spoils.",
-32 +     "Honey never spoils."),
-33 | )
-34 | 
-35 | facts = [
-note: This is an unsafe fix and may change runtime behavior
-
-ISC004 [*] Unparenthesized implicit string concatenation in collection
-  --> ISC004.py:36:5
-   |
-35 |   facts = [
-36 | /     "Octopuses have three hearts."
-37 | |     # Missing comma here.
-38 | |     "Honey never spoils.",
-   | |_________________________^
-39 |   ]
-   |
-help: Wrap implicitly concatenated strings in parentheses
-help: Did you forget a comma?
-33 | )
-34 | 
-35 | facts = [
-   -     "Octopuses have three hearts."
-36 +     ("Octopuses have three hearts."
-37 |     # Missing comma here.
-   -     "Honey never spoils.",
-38 +     "Honey never spoils."),
-39 | ]
-40 | 
-41 | facts = {
-note: This is an unsafe fix and may change runtime behavior
-
-ISC004 [*] Unparenthesized implicit string concatenation in collection
-  --> ISC004.py:42:5
-   |
-41 |   facts = {
-42 | /     "Octopuses have three hearts."
-43 | |     # Missing comma here.
-44 | |     "Honey never spoils.",
-   | |_________________________^
-45 |   }
-   |
-help: Wrap implicitly concatenated strings in parentheses
-help: Did you forget a comma?
-39 | ]
-40 | 
-41 | facts = {
-   -     "Octopuses have three hearts."
-42 +     ("Octopuses have three hearts."
-43 |     # Missing comma here.
-   -     "Honey never spoils.",
-44 +     "Honey never spoils."),
-45 | }
-46 | 
-47 | facts = (
-note: This is an unsafe fix and may change runtime behavior

crates/ruff_linter/src/rules/flake8_pytest_style/rules/raises.rs

@@ -125,9 +125,6 @@ impl Violation for PytestRaisesTooBroad {
 /// ## Why is this bad?
 /// `pytest.raises` expects to receive an expected exception as its first
 /// argument. If omitted, the `pytest.raises` call will fail at runtime.
-/// The rule will also accept calls without an expected exception but with
-/// `match` and/or `check` keyword arguments, which are also valid after
-/// pytest version 8.4.0.
 ///
 /// ## Example
 /// ```python
@@ -184,8 +181,6 @@ pub(crate) fn raises_call(checker: &Checker, call: &ast::ExprCall) {
                 .arguments
                 .find_argument("expected_exception", 0)
                 .is_none()
-                && call.arguments.find_keyword("match").is_none()
-                && call.arguments.find_keyword("check").is_none()
             {
                 checker.report_diagnostic(PytestRaisesWithoutException, call.func.range());
             }

crates/ruff_linter/src/rules/flake8_use_pathlib/helpers.rs

@@ -210,7 +210,6 @@ pub(crate) fn is_argument_non_default(arguments: &Arguments, name: &str, positio
 
 /// Returns `true` if the given call is a top-level expression in its statement.
 /// This means the call's return value is not used, so return type changes don't matter.
-pub(crate) fn is_top_level_expression_in_statement(checker: &Checker) -> bool {
+pub(crate) fn is_top_level_expression_call(checker: &Checker) -> bool {
     checker.semantic().current_expression_parent().is_none()
-        && checker.semantic().current_statement().is_expr_stmt()
 }

crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_getcwd.rs

@@ -6,7 +6,7 @@ use ruff_text_size::Ranged;
 use crate::checkers::ast::Checker;
 use crate::importer::ImportRequest;
 use crate::preview::is_fix_os_getcwd_enabled;
-use crate::rules::flake8_use_pathlib::helpers::is_top_level_expression_in_statement;
+use crate::rules::flake8_use_pathlib::helpers::is_top_level_expression_call;
 use crate::{FixAvailability, Violation};
 
 /// ## What it does
@@ -89,7 +89,7 @@ pub(crate) fn os_getcwd(checker: &Checker, call: &ExprCall, segments: &[&str]) {
 
             // Unsafe when the fix would delete comments or change a used return value
             let applicability = if checker.comment_ranges().intersects(range)
-                || !is_top_level_expression_in_statement(checker)
+                || !is_top_level_expression_call(checker)
             {
                 Applicability::Unsafe
             } else {

crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_readlink.rs

@@ -6,7 +6,7 @@ use crate::checkers::ast::Checker;
 use crate::preview::is_fix_os_readlink_enabled;
 use crate::rules::flake8_use_pathlib::helpers::{
     check_os_pathlib_single_arg_calls, is_keyword_only_argument_non_default,
-    is_top_level_expression_in_statement,
+    is_top_level_expression_call,
 };
 use crate::{FixAvailability, Violation};
 
@@ -86,7 +86,7 @@ pub(crate) fn os_readlink(checker: &Checker, call: &ExprCall, segments: &[&str])
         return;
     }
 
-    let applicability = if !is_top_level_expression_in_statement(checker) {
+    let applicability = if !is_top_level_expression_call(checker) {
         // Unsafe because the return type changes (str/bytes -> Path)
         Applicability::Unsafe
     } else {

crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_rename.rs

@@ -6,7 +6,7 @@ use crate::checkers::ast::Checker;
 use crate::preview::is_fix_os_rename_enabled;
 use crate::rules::flake8_use_pathlib::helpers::{
     check_os_pathlib_two_arg_calls, has_unknown_keywords_or_starred_expr,
-    is_keyword_only_argument_non_default, is_top_level_expression_in_statement,
+    is_keyword_only_argument_non_default, is_top_level_expression_call,
 };
 use crate::{FixAvailability, Violation};
 
@@ -92,7 +92,7 @@ pub(crate) fn os_rename(checker: &Checker, call: &ExprCall, segments: &[&str]) {
         );
 
     // Unsafe when the fix would delete comments or change a used return value
-    let applicability = if !is_top_level_expression_in_statement(checker) {
+    let applicability = if !is_top_level_expression_call(checker) {
         // Unsafe because the return type changes (None -> Path)
         Applicability::Unsafe
     } else {

crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_replace.rs

@@ -6,7 +6,7 @@ use crate::checkers::ast::Checker;
 use crate::preview::is_fix_os_replace_enabled;
 use crate::rules::flake8_use_pathlib::helpers::{
     check_os_pathlib_two_arg_calls, has_unknown_keywords_or_starred_expr,
-    is_keyword_only_argument_non_default, is_top_level_expression_in_statement,
+    is_keyword_only_argument_non_default, is_top_level_expression_call,
 };
 use crate::{FixAvailability, Violation};
 
@@ -95,7 +95,7 @@ pub(crate) fn os_replace(checker: &Checker, call: &ExprCall, segments: &[&str])
         );
 
     // Unsafe when the fix would delete comments or change a used return value
-    let applicability = if !is_top_level_expression_in_statement(checker) {
+    let applicability = if !is_top_level_expression_call(checker) {
         // Unsafe because the return type changes (None -> Path)
         Applicability::Unsafe
     } else {

crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__full_name.py.snap

@@ -567,64 +567,5 @@ PTH121 `os.path.samefile()` should be replaced by `Path.samefile()`
 138 |
 139 | os.path.samefile("pth1_file", "pth1_link", 1, *[1], **{"x": 1}, foo=1)
     | ^^^^^^^^^^^^^^^^
-140 |
-141 | # See: https://github.com/astral-sh/ruff/issues/21794
     |
 help: Replace with `Path(...).samefile()`
-
-PTH104 `os.rename()` should be replaced by `Path.rename()`
-   --> full_name.py:144:4
-    |
-142 | import sys
-143 |
-144 | if os.rename("pth1.py", "pth1.py.bak"):
-    |    ^^^^^^^^^
-145 |     print("rename: truthy")
-146 | else:
-    |
-help: Replace with `Path(...).rename(...)`
-
-PTH105 `os.replace()` should be replaced by `Path.replace()`
-   --> full_name.py:149:4
-    |
-147 |     print("rename: falsey")
-148 |
-149 | if os.replace("pth1.py.bak", "pth1.py"):
-    |    ^^^^^^^^^^
-150 |     print("replace: truthy")
-151 | else:
-    |
-help: Replace with `Path(...).replace(...)`
-
-PTH109 `os.getcwd()` should be replaced by `Path.cwd()`
-   --> full_name.py:155:14
-    |
-154 | try:
-155 |     for _ in os.getcwd():
-    |              ^^^^^^^^^
-156 |         print("getcwd: iterable")
-157 |         break
-    |
-help: Replace with `Path.cwd()`
-
-PTH109 `os.getcwd()` should be replaced by `Path.cwd()`
-   --> full_name.py:162:14
-    |
-161 | try:
-162 |     for _ in os.getcwdb():
-    |              ^^^^^^^^^^
-163 |         print("getcwdb: iterable")
-164 |         break
-    |
-help: Replace with `Path.cwd()`
-
-PTH115 `os.readlink()` should be replaced by `Path.readlink()`
-   --> full_name.py:169:14
-    |
-168 | try:
-169 |     for _ in os.readlink(sys.executable):
-    |              ^^^^^^^^^^^
-170 |         print("readlink: iterable")
-171 |         break
-    |
-help: Replace with `Path(...).readlink()`

crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__preview_full_name.py.snap

@@ -1037,142 +1037,5 @@ PTH121 `os.path.samefile()` should be replaced by `Path.samefile()`
 138 |
 139 | os.path.samefile("pth1_file", "pth1_link", 1, *[1], **{"x": 1}, foo=1)
     | ^^^^^^^^^^^^^^^^
-140 |
-141 | # See: https://github.com/astral-sh/ruff/issues/21794
     |
 help: Replace with `Path(...).samefile()`
-
-PTH104 [*] `os.rename()` should be replaced by `Path.rename()`
-   --> full_name.py:144:4
-    |
-142 | import sys
-143 |
-144 | if os.rename("pth1.py", "pth1.py.bak"):
-    |    ^^^^^^^^^
-145 |     print("rename: truthy")
-146 | else:
-    |
-help: Replace with `Path(...).rename(...)`
-140 | 
-141 | # See: https://github.com/astral-sh/ruff/issues/21794
-142 | import sys
-143 + import pathlib
-144 | 
-    - if os.rename("pth1.py", "pth1.py.bak"):
-145 + if pathlib.Path("pth1.py").rename("pth1.py.bak"):
-146 |     print("rename: truthy")
-147 | else:
-148 |     print("rename: falsey")
-note: This is an unsafe fix and may change runtime behavior
-
-PTH105 [*] `os.replace()` should be replaced by `Path.replace()`
-   --> full_name.py:149:4
-    |
-147 |     print("rename: falsey")
-148 |
-149 | if os.replace("pth1.py.bak", "pth1.py"):
-    |    ^^^^^^^^^^
-150 |     print("replace: truthy")
-151 | else:
-    |
-help: Replace with `Path(...).replace(...)`
-140 | 
-141 | # See: https://github.com/astral-sh/ruff/issues/21794
-142 | import sys
-143 + import pathlib
-144 | 
-145 | if os.rename("pth1.py", "pth1.py.bak"):
-146 |     print("rename: truthy")
-147 | else:
-148 |     print("rename: falsey")
-149 | 
-    - if os.replace("pth1.py.bak", "pth1.py"):
-150 + if pathlib.Path("pth1.py.bak").replace("pth1.py"):
-151 |     print("replace: truthy")
-152 | else:
-153 |     print("replace: falsey")
-note: This is an unsafe fix and may change runtime behavior
-
-PTH109 [*] `os.getcwd()` should be replaced by `Path.cwd()`
-   --> full_name.py:155:14
-    |
-154 | try:
-155 |     for _ in os.getcwd():
-    |              ^^^^^^^^^
-156 |         print("getcwd: iterable")
-157 |         break
-    |
-help: Replace with `Path.cwd()`
-140 | 
-141 | # See: https://github.com/astral-sh/ruff/issues/21794
-142 | import sys
-143 + import pathlib
-144 | 
-145 | if os.rename("pth1.py", "pth1.py.bak"):
-146 |     print("rename: truthy")
---------------------------------------------------------------------------------
-153 |     print("replace: falsey")
-154 | 
-155 | try:
-    -     for _ in os.getcwd():
-156 +     for _ in pathlib.Path.cwd():
-157 |         print("getcwd: iterable")
-158 |         break
-159 | except TypeError as e:
-note: This is an unsafe fix and may change runtime behavior
-
-PTH109 [*] `os.getcwd()` should be replaced by `Path.cwd()`
-   --> full_name.py:162:14
-    |
-161 | try:
-162 |     for _ in os.getcwdb():
-    |              ^^^^^^^^^^
-163 |         print("getcwdb: iterable")
-164 |         break
-    |
-help: Replace with `Path.cwd()`
-140 | 
-141 | # See: https://github.com/astral-sh/ruff/issues/21794
-142 | import sys
-143 + import pathlib
-144 | 
-145 | if os.rename("pth1.py", "pth1.py.bak"):
-146 |     print("rename: truthy")
---------------------------------------------------------------------------------
-160 |     print("getcwd: not iterable")
-161 | 
-162 | try:
-    -     for _ in os.getcwdb():
-163 +     for _ in pathlib.Path.cwd():
-164 |         print("getcwdb: iterable")
-165 |         break
-166 | except TypeError as e:
-note: This is an unsafe fix and may change runtime behavior
-
-PTH115 [*] `os.readlink()` should be replaced by `Path.readlink()`
-   --> full_name.py:169:14
-    |
-168 | try:
-169 |     for _ in os.readlink(sys.executable):
-    |              ^^^^^^^^^^^
-170 |         print("readlink: iterable")
-171 |         break
-    |
-help: Replace with `Path(...).readlink()`
-140 | 
-141 | # See: https://github.com/astral-sh/ruff/issues/21794
-142 | import sys
-143 + import pathlib
-144 | 
-145 | if os.rename("pth1.py", "pth1.py.bak"):
-146 |     print("rename: truthy")
---------------------------------------------------------------------------------
-167 |     print("getcwdb: not iterable")
-168 | 
-169 | try:
-    -     for _ in os.readlink(sys.executable):
-170 +     for _ in pathlib.Path(sys.executable).readlink():
-171 |         print("readlink: iterable")
-172 |         break
-173 | except TypeError as e:
-note: This is an unsafe fix and may change runtime behavior

crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP032_0.py.snap

@@ -902,76 +902,56 @@ help: Convert to f-string
 132 | # Non-errors
 
 UP032 [*] Use f-string instead of `format` call
-   --> UP032_0.py:135:1
+   --> UP032_0.py:160:1
     |
-133 | ###
-134 |
-135 | "\N{snowman} {}".format(a)
-    | ^^^^^^^^^^^^^^^^^^^^^^^^^^
-136 |
-137 | "{".format(a)
-    |
-help: Convert to f-string
-132 | # Non-errors
-133 | ###
-134 | 
-    - "\N{snowman} {}".format(a)
-135 + f"\N{snowman} {a}"
-136 | 
-137 | "{".format(a)
-138 | 
-
-UP032 [*] Use f-string instead of `format` call
-   --> UP032_0.py:159:1
-    |
-157 |   r'"\N{snowman} {}".format(a)'
-158 |
-159 | / "123456789 {}".format(
-160 | |     11111111111111111111111111111111111111111111111111111111111111111111111111,
-161 | | )
+158 |   r'"\N{snowman} {}".format(a)'
+159 |
+160 | / "123456789 {}".format(
+161 | |     11111111111111111111111111111111111111111111111111111111111111111111111111,
+162 | | )
     | |_^
-162 |
-163 |   """
+163 |
+164 |   """
     |
 help: Convert to f-string
-156 | 
-157 | r'"\N{snowman} {}".format(a)'
-158 | 
+157 | 
+158 | r'"\N{snowman} {}".format(a)'
+159 | 
     - "123456789 {}".format(
     -     11111111111111111111111111111111111111111111111111111111111111111111111111,
     - )
-159 + f"123456789 {11111111111111111111111111111111111111111111111111111111111111111111111111}"
-160 | 
-161 | """
-162 | {}
+160 + f"123456789 {11111111111111111111111111111111111111111111111111111111111111111111111111}"
+161 | 
+162 | """
+163 | {}
 
 UP032 [*] Use f-string instead of `format` call
-   --> UP032_0.py:163:1
+   --> UP032_0.py:164:1
     |
-161 |   )
-162 |
-163 | / """
-164 | | {}
+162 |   )
+163 |
+164 | / """
 165 | | {}
 166 | | {}
-167 | | """.format(
-168 | | 1,
-169 | | 2,
-170 | | 111111111111111111111111111111111111111111111111111111111111111111111111111111111111111,
-171 | | )
+167 | | {}
+168 | | """.format(
+169 | | 1,
+170 | | 2,
+171 | | 111111111111111111111111111111111111111111111111111111111111111111111111111111111111111,
+172 | | )
     | |_^
-172 |
-173 |   aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa = """{}
+173 |
+174 |   aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa = """{}
     |
 help: Convert to f-string
-160 |     11111111111111111111111111111111111111111111111111111111111111111111111111,
-161 | )
-162 | 
-163 + f"""
-164 + {1}
-165 + {2}
-166 + {111111111111111111111111111111111111111111111111111111111111111111111111111111111111111}
-167 | """
+161 |     11111111111111111111111111111111111111111111111111111111111111111111111111,
+162 | )
+163 | 
+164 + f"""
+165 + {1}
+166 + {2}
+167 + {111111111111111111111111111111111111111111111111111111111111111111111111111111111111111}
+168 | """
     - {}
     - {}
     - {}
@@ -980,408 +960,392 @@ help: Convert to f-string
     - 2,
     - 111111111111111111111111111111111111111111111111111111111111111111111111111111111111111,
     - )
-168 | 
-169 | aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa = """{}
-170 | """.format(
+169 | 
+170 | aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa = """{}
+171 | """.format(
 
 UP032 [*] Use f-string instead of `format` call
-   --> UP032_0.py:173:84
+   --> UP032_0.py:174:84
     |
-171 |   )
-172 |
-173 |   aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa = """{}
+172 |   )
+173 |
+174 |   aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa = """{}
     |  ____________________________________________________________________________________^
-174 | | """.format(
-175 | |     111111
-176 | | )
+175 | | """.format(
+176 | |     111111
+177 | | )
     | |_^
-177 |
-178 |   "{}".format(
+178 |
+179 |   "{}".format(
     |
 help: Convert to f-string
-170 | 111111111111111111111111111111111111111111111111111111111111111111111111111111111111111,
-171 | )
-172 | 
+171 | 111111111111111111111111111111111111111111111111111111111111111111111111111111111111111,
+172 | )
+173 | 
     - aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa = """{}
     - """.format(
     -     111111
     - )
-173 + aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa = f"""{111111}
-174 + """
-175 | 
-176 | "{}".format(
-177 |     [
+174 + aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa = f"""{111111}
+175 + """
+176 | 
+177 | "{}".format(
+178 |     [
 
 UP032 Use f-string instead of `format` call
-   --> UP032_0.py:201:1
+   --> UP032_0.py:202:1
     |
-199 |   "{}".format(**c)
-200 |
-201 | / "{}".format(
-202 | |     1  # comment
-203 | | )
+200 |   "{}".format(**c)
+201 |
+202 | / "{}".format(
+203 | |     1  # comment
+204 | | )
     | |_^
     |
 help: Convert to f-string
 
 UP032 [*] Use f-string instead of `format` call
-   --> UP032_0.py:208:1
+   --> UP032_0.py:209:1
     |
-206 | # The fixed string will exceed the line length, but it's still smaller than the
-207 | # existing line length, so it's fine.
-208 | "<Customer: {}, {}, {}, {}, {}>".format(self.internal_ids, self.external_ids, self.properties, self.tags, self.others)
+207 | # The fixed string will exceed the line length, but it's still smaller than the
+208 | # existing line length, so it's fine.
+209 | "<Customer: {}, {}, {}, {}, {}>".format(self.internal_ids, self.external_ids, self.properties, self.tags, self.others)
     | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-209 |
-210 | # When fixing, trim the trailing empty string.
+210 |
+211 | # When fixing, trim the trailing empty string.
     |
 help: Convert to f-string
-205 | 
-206 | # The fixed string will exceed the line length, but it's still smaller than the
-207 | # existing line length, so it's fine.
+206 | 
+207 | # The fixed string will exceed the line length, but it's still smaller than the
+208 | # existing line length, so it's fine.
     - "<Customer: {}, {}, {}, {}, {}>".format(self.internal_ids, self.external_ids, self.properties, self.tags, self.others)
-208 + f"<Customer: {self.internal_ids}, {self.external_ids}, {self.properties}, {self.tags}, {self.others}>"
-209 | 
-210 | # When fixing, trim the trailing empty string.
-211 | raise ValueError("Conflicting configuration dicts: {!r} {!r}"
+209 + f"<Customer: {self.internal_ids}, {self.external_ids}, {self.properties}, {self.tags}, {self.others}>"
+210 | 
+211 | # When fixing, trim the trailing empty string.
+212 | raise ValueError("Conflicting configuration dicts: {!r} {!r}"
 
 UP032 [*] Use f-string instead of `format` call
-   --> UP032_0.py:211:18
+   --> UP032_0.py:212:18
     |
-210 |   # When fixing, trim the trailing empty string.
-211 |   raise ValueError("Conflicting configuration dicts: {!r} {!r}"
+211 |   # When fixing, trim the trailing empty string.
+212 |   raise ValueError("Conflicting configuration dicts: {!r} {!r}"
     |  __________________^
-212 | |                  "".format(new_dict, d))
+213 | |                  "".format(new_dict, d))
     | |_______________________________________^
-213 |
-214 |   # When fixing, trim the trailing empty string.
+214 |
+215 |   # When fixing, trim the trailing empty string.
     |
 help: Convert to f-string
-208 | "<Customer: {}, {}, {}, {}, {}>".format(self.internal_ids, self.external_ids, self.properties, self.tags, self.others)
-209 | 
-210 | # When fixing, trim the trailing empty string.
+209 | "<Customer: {}, {}, {}, {}, {}>".format(self.internal_ids, self.external_ids, self.properties, self.tags, self.others)
+210 | 
+211 | # When fixing, trim the trailing empty string.
     - raise ValueError("Conflicting configuration dicts: {!r} {!r}"
     -                  "".format(new_dict, d))
-211 + raise ValueError(f"Conflicting configuration dicts: {new_dict!r} {d!r}")
-212 | 
-213 | # When fixing, trim the trailing empty string.
-214 | raise ValueError("Conflicting configuration dicts: {!r} {!r}"
-
-UP032 [*] Use f-string instead of `format` call
-   --> UP032_0.py:215:18
-    |
-214 |   # When fixing, trim the trailing empty string.
-215 |   raise ValueError("Conflicting configuration dicts: {!r} {!r}"
-    |  __________________^
-216 | |                  .format(new_dict, d))
-    | |_____________________________________^
-217 |
-218 |   raise ValueError(
-    |
-help: Convert to f-string
-212 |                  "".format(new_dict, d))
+212 + raise ValueError(f"Conflicting configuration dicts: {new_dict!r} {d!r}")
 213 | 
 214 | # When fixing, trim the trailing empty string.
+215 | raise ValueError("Conflicting configuration dicts: {!r} {!r}"
+
+UP032 [*] Use f-string instead of `format` call
+   --> UP032_0.py:216:18
+    |
+215 |   # When fixing, trim the trailing empty string.
+216 |   raise ValueError("Conflicting configuration dicts: {!r} {!r}"
+    |  __________________^
+217 | |                  .format(new_dict, d))
+    | |_____________________________________^
+218 |
+219 |   raise ValueError(
+    |
+help: Convert to f-string
+213 |                  "".format(new_dict, d))
+214 | 
+215 | # When fixing, trim the trailing empty string.
     - raise ValueError("Conflicting configuration dicts: {!r} {!r}"
     -                  .format(new_dict, d))
-215 + raise ValueError(f"Conflicting configuration dicts: {new_dict!r} {d!r}"
-216 +                  )
-217 | 
-218 | raise ValueError(
-219 |     "Conflicting configuration dicts: {!r} {!r}"
+216 + raise ValueError(f"Conflicting configuration dicts: {new_dict!r} {d!r}"
+217 +                  )
+218 | 
+219 | raise ValueError(
+220 |     "Conflicting configuration dicts: {!r} {!r}"
 
 UP032 [*] Use f-string instead of `format` call
-   --> UP032_0.py:219:5
+   --> UP032_0.py:220:5
     |
-218 |   raise ValueError(
-219 | /     "Conflicting configuration dicts: {!r} {!r}"
-220 | |     "".format(new_dict, d)
+219 |   raise ValueError(
+220 | /     "Conflicting configuration dicts: {!r} {!r}"
+221 | |     "".format(new_dict, d)
     | |__________________________^
-221 |   )
+222 |   )
     |
 help: Convert to f-string
-216 |                  .format(new_dict, d))
-217 | 
-218 | raise ValueError(
+217 |                  .format(new_dict, d))
+218 | 
+219 | raise ValueError(
     -     "Conflicting configuration dicts: {!r} {!r}"
     -     "".format(new_dict, d)
-219 +     f"Conflicting configuration dicts: {new_dict!r} {d!r}"
-220 | )
-221 | 
-222 | raise ValueError(
-
-UP032 [*] Use f-string instead of `format` call
-   --> UP032_0.py:224:5
-    |
-223 |   raise ValueError(
-224 | /     "Conflicting configuration dicts: {!r} {!r}"
-225 | |     "".format(new_dict, d)
-    | |__________________________^
-226 |
-227 |   )
-    |
-help: Convert to f-string
+220 +     f"Conflicting configuration dicts: {new_dict!r} {d!r}"
 221 | )
 222 | 
 223 | raise ValueError(
-    -     "Conflicting configuration dicts: {!r} {!r}"
-    -     "".format(new_dict, d)
-224 +     f"Conflicting configuration dicts: {new_dict!r} {d!r}"
-225 | 
-226 | )
-227 | 
 
 UP032 [*] Use f-string instead of `format` call
-   --> UP032_0.py:230:1
+   --> UP032_0.py:225:5
     |
-229 |   # The first string will be converted to an f-string and the curly braces in the second should be converted to be unescaped
-230 | / (
-231 | |     "{}"
-232 | |     "{{}}"
-233 | | ).format(a)
-    | |___________^
-234 |
-235 |   ("{}" "{{}}").format(a)
+224 |   raise ValueError(
+225 | /     "Conflicting configuration dicts: {!r} {!r}"
+226 | |     "".format(new_dict, d)
+    | |__________________________^
+227 |
+228 |   )
     |
 help: Convert to f-string
+222 | )
+223 | 
+224 | raise ValueError(
+    -     "Conflicting configuration dicts: {!r} {!r}"
+    -     "".format(new_dict, d)
+225 +     f"Conflicting configuration dicts: {new_dict!r} {d!r}"
+226 | 
+227 | )
 228 | 
-229 | # The first string will be converted to an f-string and the curly braces in the second should be converted to be unescaped
-230 | (
-231 +     f"{a}"
-232 |     "{}"
-    -     "{{}}"
-    - ).format(a)
-233 + )
-234 | 
-235 | ("{}" "{{}}").format(a)
-236 | 
 
 UP032 [*] Use f-string instead of `format` call
-   --> UP032_0.py:235:1
+   --> UP032_0.py:231:1
     |
-233 | ).format(a)
-234 |
-235 | ("{}" "{{}}").format(a)
+230 |   # The first string will be converted to an f-string and the curly braces in the second should be converted to be unescaped
+231 | / (
+232 | |     "{}"
+233 | |     "{{}}"
+234 | | ).format(a)
+    | |___________^
+235 |
+236 |   ("{}" "{{}}").format(a)
+    |
+help: Convert to f-string
+229 | 
+230 | # The first string will be converted to an f-string and the curly braces in the second should be converted to be unescaped
+231 | (
+232 +     f"{a}"
+233 |     "{}"
+    -     "{{}}"
+    - ).format(a)
+234 + )
+235 | 
+236 | ("{}" "{{}}").format(a)
+237 | 
+
+UP032 [*] Use f-string instead of `format` call
+   --> UP032_0.py:236:1
+    |
+234 | ).format(a)
+235 |
+236 | ("{}" "{{}}").format(a)
     | ^^^^^^^^^^^^^^^^^^^^^^^
     |
 help: Convert to f-string
-232 |     "{{}}"
-233 | ).format(a)
-234 | 
+233 |     "{{}}"
+234 | ).format(a)
+235 | 
     - ("{}" "{{}}").format(a)
-235 + (f"{a}" "{}")
-236 | 
+236 + (f"{a}" "{}")
 237 | 
-238 | # Both strings will be converted to an f-string and the curly braces in the second should left escaped
+238 | 
+239 | # Both strings will be converted to an f-string and the curly braces in the second should left escaped
 
 UP032 [*] Use f-string instead of `format` call
-   --> UP032_0.py:239:1
+   --> UP032_0.py:240:1
     |
-238 |   # Both strings will be converted to an f-string and the curly braces in the second should left escaped
-239 | / (
-240 | |     "{}"
-241 | |     "{{{}}}"
-242 | | ).format(a, b)
+239 |   # Both strings will be converted to an f-string and the curly braces in the second should left escaped
+240 | / (
+241 | |     "{}"
+242 | |     "{{{}}}"
+243 | | ).format(a, b)
     | |______________^
-243 |
-244 |   ("{}" "{{{}}}").format(a, b)
+244 |
+245 |   ("{}" "{{{}}}").format(a, b)
     |
 help: Convert to f-string
-237 | 
-238 | # Both strings will be converted to an f-string and the curly braces in the second should left escaped
-239 | (
+238 | 
+239 | # Both strings will be converted to an f-string and the curly braces in the second should left escaped
+240 | (
     -     "{}"
     -     "{{{}}}"
     - ).format(a, b)
-240 +     f"{a}"
-241 +     f"{{{b}}}"
-242 + )
-243 | 
-244 | ("{}" "{{{}}}").format(a, b)
-245 | 
+241 +     f"{a}"
+242 +     f"{{{b}}}"
+243 + )
+244 | 
+245 | ("{}" "{{{}}}").format(a, b)
+246 | 
 
 UP032 [*] Use f-string instead of `format` call
-   --> UP032_0.py:244:1
+   --> UP032_0.py:245:1
     |
-242 | ).format(a, b)
-243 |
-244 | ("{}" "{{{}}}").format(a, b)
+243 | ).format(a, b)
+244 |
+245 | ("{}" "{{{}}}").format(a, b)
     | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-245 |
-246 | # The dictionary should be parenthesized.
+246 |
+247 | # The dictionary should be parenthesized.
     |
 help: Convert to f-string
-241 |     "{{{}}}"
-242 | ).format(a, b)
-243 | 
+242 |     "{{{}}}"
+243 | ).format(a, b)
+244 | 
     - ("{}" "{{{}}}").format(a, b)
-244 + (f"{a}" f"{{{b}}}")
-245 | 
-246 | # The dictionary should be parenthesized.
-247 | "{}".format({0: 1}[0])
+245 + (f"{a}" f"{{{b}}}")
+246 | 
+247 | # The dictionary should be parenthesized.
+248 | "{}".format({0: 1}[0])
 
 UP032 [*] Use f-string instead of `format` call
-   --> UP032_0.py:247:1
+   --> UP032_0.py:248:1
     |
-246 | # The dictionary should be parenthesized.
-247 | "{}".format({0: 1}[0])
+247 | # The dictionary should be parenthesized.
+248 | "{}".format({0: 1}[0])
     | ^^^^^^^^^^^^^^^^^^^^^^
-248 |
-249 | # The dictionary should be parenthesized.
+249 |
+250 | # The dictionary should be parenthesized.
     |
 help: Convert to f-string
-244 | ("{}" "{{{}}}").format(a, b)
-245 | 
-246 | # The dictionary should be parenthesized.
+245 | ("{}" "{{{}}}").format(a, b)
+246 | 
+247 | # The dictionary should be parenthesized.
     - "{}".format({0: 1}[0])
-247 + f"{({0: 1}[0])}"
-248 | 
-249 | # The dictionary should be parenthesized.
-250 | "{}".format({0: 1}.bar)
+248 + f"{({0: 1}[0])}"
+249 | 
+250 | # The dictionary should be parenthesized.
+251 | "{}".format({0: 1}.bar)
 
 UP032 [*] Use f-string instead of `format` call
-   --> UP032_0.py:250:1
+   --> UP032_0.py:251:1
     |
-249 | # The dictionary should be parenthesized.
-250 | "{}".format({0: 1}.bar)
+250 | # The dictionary should be parenthesized.
+251 | "{}".format({0: 1}.bar)
     | ^^^^^^^^^^^^^^^^^^^^^^^
-251 |
-252 | # The dictionary should be parenthesized.
+252 |
+253 | # The dictionary should be parenthesized.
     |
 help: Convert to f-string
-247 | "{}".format({0: 1}[0])
-248 | 
-249 | # The dictionary should be parenthesized.
+248 | "{}".format({0: 1}[0])
+249 | 
+250 | # The dictionary should be parenthesized.
     - "{}".format({0: 1}.bar)
-250 + f"{({0: 1}.bar)}"
-251 | 
-252 | # The dictionary should be parenthesized.
-253 | "{}".format({0: 1}())
+251 + f"{({0: 1}.bar)}"
+252 | 
+253 | # The dictionary should be parenthesized.
+254 | "{}".format({0: 1}())
 
 UP032 [*] Use f-string instead of `format` call
-   --> UP032_0.py:253:1
+   --> UP032_0.py:254:1
     |
-252 | # The dictionary should be parenthesized.
-253 | "{}".format({0: 1}())
+253 | # The dictionary should be parenthesized.
+254 | "{}".format({0: 1}())
     | ^^^^^^^^^^^^^^^^^^^^^
-254 |
-255 | # The string shouldn't be converted, since it would require repeating the function call.
+255 |
+256 | # The string shouldn't be converted, since it would require repeating the function call.
     |
 help: Convert to f-string
-250 | "{}".format({0: 1}.bar)
-251 | 
-252 | # The dictionary should be parenthesized.
+251 | "{}".format({0: 1}.bar)
+252 | 
+253 | # The dictionary should be parenthesized.
     - "{}".format({0: 1}())
-253 + f"{({0: 1}())}"
-254 | 
-255 | # The string shouldn't be converted, since it would require repeating the function call.
-256 | "{x} {x}".format(x=foo())
+254 + f"{({0: 1}())}"
+255 | 
+256 | # The string shouldn't be converted, since it would require repeating the function call.
+257 | "{x} {x}".format(x=foo())
 
 UP032 [*] Use f-string instead of `format` call
-   --> UP032_0.py:260:1
+   --> UP032_0.py:261:1
     |
-259 | # The string _should_ be converted, since the function call is repeated in the arguments.
-260 | "{0} {1}".format(foo(), foo())
+260 | # The string _should_ be converted, since the function call is repeated in the arguments.
+261 | "{0} {1}".format(foo(), foo())
     | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-261 |
-262 | # The call should be removed, but the string itself should remain.
+262 |
+263 | # The call should be removed, but the string itself should remain.
     |
 help: Convert to f-string
-257 | "{0} {0}".format(foo())
-258 | 
-259 | # The string _should_ be converted, since the function call is repeated in the arguments.
+258 | "{0} {0}".format(foo())
+259 | 
+260 | # The string _should_ be converted, since the function call is repeated in the arguments.
     - "{0} {1}".format(foo(), foo())
-260 + f"{foo()} {foo()}"
-261 | 
-262 | # The call should be removed, but the string itself should remain.
-263 | ''.format(self.project)
+261 + f"{foo()} {foo()}"
+262 | 
+263 | # The call should be removed, but the string itself should remain.
+264 | ''.format(self.project)
 
 UP032 [*] Use f-string instead of `format` call
-   --> UP032_0.py:263:1
+   --> UP032_0.py:264:1
     |
-262 | # The call should be removed, but the string itself should remain.
-263 | ''.format(self.project)
+263 | # The call should be removed, but the string itself should remain.
+264 | ''.format(self.project)
     | ^^^^^^^^^^^^^^^^^^^^^^^
-264 |
-265 | # The call should be removed, but the string itself should remain.
+265 |
+266 | # The call should be removed, but the string itself should remain.
     |
 help: Convert to f-string
-260 | "{0} {1}".format(foo(), foo())
-261 | 
-262 | # The call should be removed, but the string itself should remain.
+261 | "{0} {1}".format(foo(), foo())
+262 | 
+263 | # The call should be removed, but the string itself should remain.
     - ''.format(self.project)
-263 + ''
-264 | 
-265 | # The call should be removed, but the string itself should remain.
-266 | "".format(self.project)
+264 + ''
+265 | 
+266 | # The call should be removed, but the string itself should remain.
+267 | "".format(self.project)
 
 UP032 [*] Use f-string instead of `format` call
-   --> UP032_0.py:266:1
+   --> UP032_0.py:267:1
     |
-265 | # The call should be removed, but the string itself should remain.
-266 | "".format(self.project)
+266 | # The call should be removed, but the string itself should remain.
+267 | "".format(self.project)
     | ^^^^^^^^^^^^^^^^^^^^^^^
-267 |
-268 | # Not a valid type annotation but this test shouldn't result in a panic.
+268 |
+269 | # Not a valid type annotation but this test shouldn't result in a panic.
     |
 help: Convert to f-string
-263 | ''.format(self.project)
-264 | 
-265 | # The call should be removed, but the string itself should remain.
+264 | ''.format(self.project)
+265 | 
+266 | # The call should be removed, but the string itself should remain.
     - "".format(self.project)
-266 + ""
-267 | 
-268 | # Not a valid type annotation but this test shouldn't result in a panic.
-269 | # Refer: https://github.com/astral-sh/ruff/issues/11736
+267 + ""
+268 | 
+269 | # Not a valid type annotation but this test shouldn't result in a panic.
+270 | # Refer: https://github.com/astral-sh/ruff/issues/11736
 
 UP032 [*] Use f-string instead of `format` call
-   --> UP032_0.py:270:5
+   --> UP032_0.py:271:5
     |
-268 | # Not a valid type annotation but this test shouldn't result in a panic.
-269 | # Refer: https://github.com/astral-sh/ruff/issues/11736
-270 | x: "'{} + {}'.format(x, y)"
+269 | # Not a valid type annotation but this test shouldn't result in a panic.
+270 | # Refer: https://github.com/astral-sh/ruff/issues/11736
+271 | x: "'{} + {}'.format(x, y)"
     |     ^^^^^^^^^^^^^^^^^^^^^^
-271 |
-272 | # Regression https://github.com/astral-sh/ruff/issues/21000
+272 |
+273 | # Regression https://github.com/astral-sh/ruff/issues/21000
     |
 help: Convert to f-string
-267 | 
-268 | # Not a valid type annotation but this test shouldn't result in a panic.
-269 | # Refer: https://github.com/astral-sh/ruff/issues/11736
+268 | 
+269 | # Not a valid type annotation but this test shouldn't result in a panic.
+270 | # Refer: https://github.com/astral-sh/ruff/issues/11736
     - x: "'{} + {}'.format(x, y)"
-270 + x: "f'{x} + {y}'"
-271 | 
-272 | # Regression https://github.com/astral-sh/ruff/issues/21000
-273 | # Fix should parenthesize walrus
+271 + x: "f'{x} + {y}'"
+272 | 
+273 | # Regression https://github.com/astral-sh/ruff/issues/21000
+274 | # Fix should parenthesize walrus
 
 UP032 [*] Use f-string instead of `format` call
-   --> UP032_0.py:276:14
+   --> UP032_0.py:277:14
     |
-274 | if __name__ == "__main__":
-275 |     number = 0
-276 |     string = "{}".format(number := number + 1)
+275 | if __name__ == "__main__":
+276 |     number = 0
+277 |     string = "{}".format(number := number + 1)
     |              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-277 |     print(string)
+278 |     print(string)
     |
 help: Convert to f-string
-273 | # Fix should parenthesize walrus
-274 | if __name__ == "__main__":
-275 |     number = 0
+274 | # Fix should parenthesize walrus
+275 | if __name__ == "__main__":
+276 |     number = 0
     -     string = "{}".format(number := number + 1)
-276 +     string = f"{(number := number + 1)}"
-277 |     print(string)
-278 | 
-279 | # Unicode escape
-
-UP032 [*] Use f-string instead of `format` call
-   --> UP032_0.py:280:1
-    |
-279 | # Unicode escape
-280 | "\N{angle}AOB = {angle}°".format(angle=180)
-    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-    |
-help: Convert to f-string
-277 |     print(string)
-278 | 
-279 | # Unicode escape
-    - "\N{angle}AOB = {angle}°".format(angle=180)
-280 + f"\N{angle}AOB = {180}°"
+277 +     string = f"{(number := number + 1)}"
+278 |     print(string)

crates/ruff_linter/src/rules/refurb/helpers.rs

@@ -3,11 +3,10 @@ use std::borrow::Cow;
 use ruff_python_ast::PythonVersion;
 use ruff_python_ast::{self as ast, Expr, name::Name, token::parenthesized_range};
 use ruff_python_codegen::Generator;
-use ruff_python_semantic::{ResolvedReference, SemanticModel};
+use ruff_python_semantic::{BindingId, ResolvedReference, SemanticModel};
 use ruff_text_size::{Ranged, TextRange};
 
 use crate::checkers::ast::Checker;
-use crate::rules::flake8_async::rules::blocking_open_call::is_open_call_from_pathlib;
 use crate::{Applicability, Edit, Fix};
 
 /// Format a code snippet to call `name.method()`.
@@ -120,13 +119,14 @@ impl OpenMode {
 pub(super) struct FileOpen<'a> {
     /// With item where the open happens, we use it for the reporting range.
     pub(super) item: &'a ast::WithItem,
+    /// Filename expression used as the first argument in `open`, we use it in the diagnostic message.
+    pub(super) filename: &'a Expr,
     /// The file open mode.
     pub(super) mode: OpenMode,
     /// The file open keywords.
     pub(super) keywords: Vec<&'a ast::Keyword>,
     /// We only check `open` operations whose file handles are used exactly once.
     pub(super) reference: &'a ResolvedReference,
-    pub(super) argument: OpenArgument<'a>,
 }
 
 impl FileOpen<'_> {
@@ -137,45 +137,6 @@ impl FileOpen<'_> {
     }
 }
 
-#[derive(Debug, Clone, Copy)]
-pub(super) enum OpenArgument<'a> {
-    /// The filename argument to `open`, e.g. "foo.txt" in:
-    ///
-    /// ```py
-    /// f = open("foo.txt")
-    /// ```
-    Builtin { filename: &'a Expr },
-    /// The `Path` receiver of a `pathlib.Path.open` call, e.g. the `p` in the
-    /// context manager in:
-    ///
-    /// ```py
-    /// p = Path("foo.txt")
-    /// with p.open() as f: ...
-    /// ```
-    ///
-    /// or `Path("foo.txt")` in
-    ///
-    /// ```py
-    /// with Path("foo.txt").open() as f: ...
-    /// ```
-    Pathlib { path: &'a Expr },
-}
-
-impl OpenArgument<'_> {
-    pub(super) fn display<'src>(&self, source: &'src str) -> &'src str {
-        &source[self.range()]
-    }
-}
-
-impl Ranged for OpenArgument<'_> {
-    fn range(&self) -> TextRange {
-        match self {
-            OpenArgument::Builtin { filename } => filename.range(),
-            OpenArgument::Pathlib { path } => path.range(),
-        }
-    }
-}
-
 /// Find and return all `open` operations in the given `with` statement.
 pub(super) fn find_file_opens<'a>(
     with: &'a ast::StmtWith,
@@ -185,65 +146,10 @@ pub(super) fn find_file_opens<'a>(
 ) -> Vec<FileOpen<'a>> {
     with.items
         .iter()
-        .filter_map(|item| {
-            find_file_open(item, with, semantic, read_mode, python_version)
-                .or_else(|| find_path_open(item, with, semantic, read_mode, python_version))
-        })
+        .filter_map(|item| find_file_open(item, with, semantic, read_mode, python_version))
         .collect()
 }
 
-fn resolve_file_open<'a>(
-    item: &'a ast::WithItem,
-    with: &'a ast::StmtWith,
-    semantic: &'a SemanticModel<'a>,
-    read_mode: bool,
-    mode: OpenMode,
-    keywords: Vec<&'a ast::Keyword>,
-    argument: OpenArgument<'a>,
-) -> Option<FileOpen<'a>> {
-    match mode {
-        OpenMode::ReadText | OpenMode::ReadBytes => {
-            if !read_mode {
-                return None;
-            }
-        }
-        OpenMode::WriteText | OpenMode::WriteBytes => {
-            if read_mode {
-                return None;
-            }
-        }
-    }
-
-    if matches!(mode, OpenMode::ReadBytes | OpenMode::WriteBytes) && !keywords.is_empty() {
-        return None;
-    }
-    let var = item.optional_vars.as_deref()?.as_name_expr()?;
-    let scope = semantic.current_scope();
-
-    let binding = scope.get_all(var.id.as_str()).find_map(|id| {
-        let b = semantic.binding(id);
-        (b.range() == var.range()).then_some(b)
-    })?;
-    let references: Vec<&ResolvedReference> = binding
-        .references
-        .iter()
-        .map(|id| semantic.reference(*id))
-        .filter(|reference| with.range().contains_range(reference.range()))
-        .collect();
-
-    let [reference] = references.as_slice() else {
-        return None;
-    };
-
-    Some(FileOpen {
-        item,
-        mode,
-        keywords,
-        reference,
-        argument,
-    })
-}
-
 /// Find `open` operation in the given `with` item.
 fn find_file_open<'a>(
     item: &'a ast::WithItem,
@@ -259,6 +165,8 @@ fn find_file_open<'a>(
         ..
     } = item.context_expr.as_call_expr()?;
 
+    let var = item.optional_vars.as_deref()?.as_name_expr()?;
+
     // Ignore calls with `*args` and `**kwargs`. In the exact case of `open(*filename, mode="w")`,
     // it could be a match; but in all other cases, the call _could_ contain unsupported keyword
     // arguments, like `buffering`.
@@ -279,57 +187,58 @@ fn find_file_open<'a>(
     let (keywords, kw_mode) = match_open_keywords(keywords, read_mode, python_version)?;
 
     let mode = kw_mode.unwrap_or(pos_mode);
-    resolve_file_open(
-        item,
-        with,
-        semantic,
-        read_mode,
-        mode,
-        keywords,
-        OpenArgument::Builtin { filename },
-    )
-}
 
-fn find_path_open<'a>(
-    item: &'a ast::WithItem,
-    with: &'a ast::StmtWith,
-    semantic: &'a SemanticModel<'a>,
-    read_mode: bool,
-    python_version: PythonVersion,
-) -> Option<FileOpen<'a>> {
-    let ast::ExprCall {
-        func,
-        arguments: ast::Arguments { args, keywords, .. },
-        ..
-    } = item.context_expr.as_call_expr()?;
-    if args.iter().any(Expr::is_starred_expr)
-        || keywords.iter().any(|keyword| keyword.arg.is_none())
-    {
+    match mode {
+        OpenMode::ReadText | OpenMode::ReadBytes => {
+            if !read_mode {
+                return None;
+            }
+        }
+        OpenMode::WriteText | OpenMode::WriteBytes => {
+            if read_mode {
+                return None;
+            }
+        }
+    }
+
+    // Path.read_bytes and Path.write_bytes do not support any kwargs.
+    if matches!(mode, OpenMode::ReadBytes | OpenMode::WriteBytes) && !keywords.is_empty() {
         return None;
     }
-    if !is_open_call_from_pathlib(func, semantic) {
+
+    // Now we need to find what is this variable bound to...
+    let scope = semantic.current_scope();
+    let bindings: Vec<BindingId> = scope.get_all(var.id.as_str()).collect();
+
+    let binding = bindings
+        .iter()
+        .map(|id| semantic.binding(*id))
+        // We might have many bindings with the same name, but we only care
+        // for the one we are looking at right now.
+        .find(|binding| binding.range() == var.range())?;
+
+    // Since many references can share the same binding, we can limit our attention span
+    // exclusively to the body of the current `with` statement.
+    let references: Vec<&ResolvedReference> = binding
+        .references
+        .iter()
+        .map(|id| semantic.reference(*id))
+        .filter(|reference| with.range().contains_range(reference.range()))
+        .collect();
+
+    // And even with all these restrictions, if the file handle gets used not exactly once,
+    // it doesn't fit the bill.
+    let [reference] = references.as_slice() else {
         return None;
-    }
-    let attr = func.as_attribute_expr()?;
-    let mode = if args.is_empty() {
-        OpenMode::ReadText
-    } else {
-        match_open_mode(args.first()?)?
     };
 
-    let (keywords, kw_mode) = match_open_keywords(keywords, read_mode, python_version)?;
-    let mode = kw_mode.unwrap_or(mode);
-    resolve_file_open(
+    Some(FileOpen {
         item,
-        with,
-        semantic,
-        read_mode,
+        filename,
         mode,
         keywords,
-        OpenArgument::Pathlib {
-            path: attr.value.as_ref(),
-        },
-    )
+        reference,
+    })
 }
 
 /// Match positional arguments. Return expression for the file name and open mode.

crates/ruff_linter/src/rules/refurb/mod.rs

@@ -15,8 +15,7 @@ mod tests {
     use crate::test::test_path;
     use crate::{assert_diagnostics, settings};
 
-    #[test_case(Rule::ReadWholeFile, Path::new("FURB101_0.py"))]
-    #[test_case(Rule::ReadWholeFile, Path::new("FURB101_1.py"))]
+    #[test_case(Rule::ReadWholeFile, Path::new("FURB101.py"))]
     #[test_case(Rule::RepeatedAppend, Path::new("FURB113.py"))]
     #[test_case(Rule::IfExpInsteadOfOrOperator, Path::new("FURB110.py"))]
     #[test_case(Rule::ReimplementedOperator, Path::new("FURB118.py"))]
@@ -47,8 +46,7 @@ mod tests {
     #[test_case(Rule::MetaClassABCMeta, Path::new("FURB180.py"))]
     #[test_case(Rule::HashlibDigestHex, Path::new("FURB181.py"))]
     #[test_case(Rule::ListReverseCopy, Path::new("FURB187.py"))]
-    #[test_case(Rule::WriteWholeFile, Path::new("FURB103_0.py"))]
-    #[test_case(Rule::WriteWholeFile, Path::new("FURB103_1.py"))]
+    #[test_case(Rule::WriteWholeFile, Path::new("FURB103.py"))]
     #[test_case(Rule::FStringNumberFormat, Path::new("FURB116.py"))]
     #[test_case(Rule::SortedMinMax, Path::new("FURB192.py"))]
     #[test_case(Rule::SliceToRemovePrefixOrSuffix, Path::new("FURB188.py"))]
@@ -67,7 +65,7 @@ mod tests {
     #[test]
     fn write_whole_file_python_39() -> Result<()> {
         let diagnostics = test_path(
-            Path::new("refurb/FURB103_0.py"),
+            Path::new("refurb/FURB103.py"),
             &settings::LinterSettings::for_rule(Rule::WriteWholeFile)
                 .with_target_version(PythonVersion::PY39),
         )?;

crates/ruff_linter/src/rules/refurb/rules/read_whole_file.rs

@@ -10,7 +10,7 @@ use ruff_text_size::{Ranged, TextRange};
 use crate::checkers::ast::Checker;
 use crate::fix::snippet::SourceCodeSnippet;
 use crate::importer::ImportRequest;
-use crate::rules::refurb::helpers::{FileOpen, OpenArgument, find_file_opens};
+use crate::rules::refurb::helpers::{FileOpen, find_file_opens};
 use crate::{FixAvailability, Violation};
 
 /// ## What it does
@@ -42,41 +42,27 @@ use crate::{FixAvailability, Violation};
 /// - [Python documentation: `Path.read_text`](https://docs.python.org/3/library/pathlib.html#pathlib.Path.read_text)
 #[derive(ViolationMetadata)]
 #[violation_metadata(preview_since = "v0.1.2")]
-pub(crate) struct ReadWholeFile<'a> {
+pub(crate) struct ReadWholeFile {
     filename: SourceCodeSnippet,
     suggestion: SourceCodeSnippet,
-    argument: OpenArgument<'a>,
 }
 
-impl Violation for ReadWholeFile<'_> {
+impl Violation for ReadWholeFile {
     const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes;
 
     #[derive_message_formats]
     fn message(&self) -> String {
         let filename = self.filename.truncated_display();
         let suggestion = self.suggestion.truncated_display();
-        match self.argument {
-            OpenArgument::Pathlib { .. } => {
-                format!(
-                    "`Path.open()` followed by `read()` can be replaced by `{filename}.{suggestion}`"
-                )
-            }
-            OpenArgument::Builtin { .. } => {
-                format!("`open` and `read` should be replaced by `Path({filename}).{suggestion}`")
-            }
-        }
+        format!("`open` and `read` should be replaced by `Path({filename}).{suggestion}`")
     }
 
     fn fix_title(&self) -> Option<String> {
-        let filename = self.filename.truncated_display();
-        let suggestion = self.suggestion.truncated_display();
-
-        match self.argument {
-            OpenArgument::Pathlib { .. } => Some(format!("Replace with `{filename}.{suggestion}`")),
-            OpenArgument::Builtin { .. } => {
-                Some(format!("Replace with `Path({filename}).{suggestion}`"))
-            }
-        }
+        Some(format!(
+            "Replace with `Path({}).{}`",
+            self.filename.truncated_display(),
+            self.suggestion.truncated_display(),
+        ))
     }
 }
 
@@ -128,13 +114,13 @@ impl<'a> Visitor<'a> for ReadMatcher<'a, '_> {
                 .position(|open| open.is_ref(read_from))
             {
                 let open = self.candidates.remove(open);
-                let filename_display = open.argument.display(self.checker.source());
                 let suggestion = make_suggestion(&open, self.checker.generator());
                 let mut diagnostic = self.checker.report_diagnostic(
                     ReadWholeFile {
-                        filename: SourceCodeSnippet::from_str(filename_display),
+                        filename: SourceCodeSnippet::from_str(
+                            &self.checker.generator().expr(open.filename),
+                        ),
                         suggestion: SourceCodeSnippet::from_str(&suggestion),
-                        argument: open.argument,
                     },
                     open.item.range(),
                 );
@@ -202,6 +188,8 @@ fn generate_fix(
 
     let locator = checker.locator();
 
+    let filename_code = locator.slice(open.filename.range());
+
     let (import_edit, binding) = checker
         .importer()
         .get_or_import_symbol(
@@ -218,15 +206,10 @@ fn generate_fix(
         [Stmt::Assign(ast::StmtAssign { targets, value, .. })] if value.range() == expr.range() => {
             match targets.as_slice() {
                 [Expr::Name(name)] => {
-                    let target = match open.argument {
-                        OpenArgument::Builtin { filename } => {
-                            let filename_code = locator.slice(filename.range());
-                            format!("{binding}({filename_code})")
-                        }
-                        OpenArgument::Pathlib { path } => locator.slice(path.range()).to_string(),
-                    };
-
-                    format!("{name} = {target}.{suggestion}", name = name.id)
+                    format!(
+                        "{name} = {binding}({filename_code}).{suggestion}",
+                        name = name.id
+                    )
                 }
                 _ => return None,
             }
@@ -240,16 +223,8 @@ fn generate_fix(
             }),
         ] if value.range() == expr.range() => match target.as_ref() {
             Expr::Name(name) => {
-                let target = match open.argument {
-                    OpenArgument::Builtin { filename } => {
-                        let filename_code = locator.slice(filename.range());
-                        format!("{binding}({filename_code})")
-                    }
-                    OpenArgument::Pathlib { path } => locator.slice(path.range()).to_string(),
-                };
-
                 format!(
-                    "{var}: {ann} = {target}.{suggestion}",
+                    "{var}: {ann} = {binding}({filename_code}).{suggestion}",
                     var = name.id,
                     ann = locator.slice(annotation.range())
                 )

crates/ruff_linter/src/rules/refurb/rules/repeated_append.rs

@@ -176,7 +176,7 @@ fn match_consecutive_appends<'a>(
     let suite = if semantic.at_top_level() {
         // If the statement is at the top level, we should go to the parent module.
         // Module is available in the definitions list.
-        EnclosingSuite::new(semantic.definitions.python_ast()?, stmt.into())?
+        EnclosingSuite::new(semantic.definitions.python_ast()?, stmt)?
     } else {
         // Otherwise, go to the parent, and take its body as a sequence of siblings.
         semantic

crates/ruff_linter/src/rules/refurb/rules/write_whole_file.rs

@@ -9,7 +9,7 @@ use ruff_text_size::Ranged;
 use crate::checkers::ast::Checker;
 use crate::fix::snippet::SourceCodeSnippet;
 use crate::importer::ImportRequest;
-use crate::rules::refurb::helpers::{FileOpen, OpenArgument, find_file_opens};
+use crate::rules::refurb::helpers::{FileOpen, find_file_opens};
 use crate::{FixAvailability, Locator, Violation};
 
 /// ## What it does
@@ -42,40 +42,26 @@ use crate::{FixAvailability, Locator, Violation};
 /// - [Python documentation: `Path.write_text`](https://docs.python.org/3/library/pathlib.html#pathlib.Path.write_text)
 #[derive(ViolationMetadata)]
 #[violation_metadata(preview_since = "v0.3.6")]
-pub(crate) struct WriteWholeFile<'a> {
+pub(crate) struct WriteWholeFile {
     filename: SourceCodeSnippet,
     suggestion: SourceCodeSnippet,
-    argument: OpenArgument<'a>,
 }
 
-impl Violation for WriteWholeFile<'_> {
+impl Violation for WriteWholeFile {
     const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes;
 
     #[derive_message_formats]
     fn message(&self) -> String {
         let filename = self.filename.truncated_display();
         let suggestion = self.suggestion.truncated_display();
-        match self.argument {
-            OpenArgument::Pathlib { .. } => {
-                format!(
-                    "`Path.open()` followed by `write()` can be replaced by `{filename}.{suggestion}`"
-                )
-            }
-            OpenArgument::Builtin { .. } => {
-                format!("`open` and `write` should be replaced by `Path({filename}).{suggestion}`")
-            }
-        }
+        format!("`open` and `write` should be replaced by `Path({filename}).{suggestion}`")
     }
     fn fix_title(&self) -> Option<String> {
-        let filename = self.filename.truncated_display();
-        let suggestion = self.suggestion.truncated_display();
-
-        match self.argument {
-            OpenArgument::Pathlib { .. } => Some(format!("Replace with `{filename}.{suggestion}`")),
-            OpenArgument::Builtin { .. } => {
-                Some(format!("Replace with `Path({filename}).{suggestion}`"))
-            }
-        }
+        Some(format!(
+            "Replace with `Path({}).{}`",
+            self.filename.truncated_display(),
+            self.suggestion.truncated_display(),
+        ))
     }
 }
 
@@ -139,15 +125,16 @@ impl<'a> Visitor<'a> for WriteMatcher<'a, '_> {
                 .position(|open| open.is_ref(write_to))
             {
                 let open = self.candidates.remove(open);
+
                 if self.loop_counter == 0 {
-                    let filename_display = open.argument.display(self.checker.source());
                     let suggestion = make_suggestion(&open, content, self.checker.locator());
 
                     let mut diagnostic = self.checker.report_diagnostic(
                         WriteWholeFile {
-                            filename: SourceCodeSnippet::from_str(filename_display),
+                            filename: SourceCodeSnippet::from_str(
+                                &self.checker.generator().expr(open.filename),
+                            ),
                             suggestion: SourceCodeSnippet::from_str(&suggestion),
-                            argument: open.argument,
                         },
                         open.item.range(),
                     );
@@ -211,6 +198,7 @@ fn generate_fix(
     }
 
     let locator = checker.locator();
+    let filename_code = locator.slice(open.filename.range());
 
     let (import_edit, binding) = checker
         .importer()
@@ -221,15 +209,7 @@ fn generate_fix(
         )
         .ok()?;
 
-    let target = match open.argument {
-        OpenArgument::Builtin { filename } => {
-            let filename_code = locator.slice(filename.range());
-            format!("{binding}({filename_code})")
-        }
-        OpenArgument::Pathlib { path } => locator.slice(path.range()).to_string(),
-    };
-
-    let replacement = format!("{target}.{suggestion}");
+    let replacement = format!("{binding}({filename_code}).{suggestion}");
 
     let applicability = if checker.comment_ranges().intersects(with_stmt.range()) {
         Applicability::Unsafe

crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB101_FURB101.py.snap

@@ -2,7 +2,7 @@
 source: crates/ruff_linter/src/rules/refurb/mod.rs
 ---
 FURB101 [*] `open` and `read` should be replaced by `Path("file.txt").read_text()`
-  --> FURB101_0.py:12:6
+  --> FURB101.py:12:6
    |
 11 | # FURB101
 12 | with open("file.txt") as f:
@@ -26,7 +26,7 @@ help: Replace with `Path("file.txt").read_text()`
 16 | with open("file.txt", "rb") as f:
 
 FURB101 [*] `open` and `read` should be replaced by `Path("file.txt").read_bytes()`
-  --> FURB101_0.py:16:6
+  --> FURB101.py:16:6
    |
 15 | # FURB101
 16 | with open("file.txt", "rb") as f:
@@ -50,7 +50,7 @@ help: Replace with `Path("file.txt").read_bytes()`
 20 | with open("file.txt", mode="rb") as f:
 
 FURB101 [*] `open` and `read` should be replaced by `Path("file.txt").read_bytes()`
-  --> FURB101_0.py:20:6
+  --> FURB101.py:20:6
    |
 19 | # FURB101
 20 | with open("file.txt", mode="rb") as f:
@@ -74,7 +74,7 @@ help: Replace with `Path("file.txt").read_bytes()`
 24 | with open("file.txt", encoding="utf8") as f:
 
 FURB101 [*] `open` and `read` should be replaced by `Path("file.txt").read_text(encoding="utf8")`
-  --> FURB101_0.py:24:6
+  --> FURB101.py:24:6
    |
 23 | # FURB101
 24 | with open("file.txt", encoding="utf8") as f:
@@ -98,7 +98,7 @@ help: Replace with `Path("file.txt").read_text(encoding="utf8")`
 28 | with open("file.txt", errors="ignore") as f:
 
 FURB101 [*] `open` and `read` should be replaced by `Path("file.txt").read_text(errors="ignore")`
-  --> FURB101_0.py:28:6
+  --> FURB101.py:28:6
    |
 27 | # FURB101
 28 | with open("file.txt", errors="ignore") as f:
@@ -122,7 +122,7 @@ help: Replace with `Path("file.txt").read_text(errors="ignore")`
 32 | with open("file.txt", mode="r") as f:  # noqa: FURB120
 
 FURB101 [*] `open` and `read` should be replaced by `Path("file.txt").read_text()`
-  --> FURB101_0.py:32:6
+  --> FURB101.py:32:6
    |
 31 | # FURB101
 32 | with open("file.txt", mode="r") as f:  # noqa: FURB120
@@ -147,7 +147,7 @@ help: Replace with `Path("file.txt").read_text()`
 note: This is an unsafe fix and may change runtime behavior
 
 FURB101 `open` and `read` should be replaced by `Path(foo()).read_bytes()`
-  --> FURB101_0.py:36:6
+  --> FURB101.py:36:6
    |
 35 | # FURB101
 36 | with open(foo(), "rb") as f:
@@ -158,7 +158,7 @@ FURB101 `open` and `read` should be replaced by `Path(foo()).read_bytes()`
 help: Replace with `Path(foo()).read_bytes()`
 
 FURB101 `open` and `read` should be replaced by `Path("a.txt").read_text()`
-  --> FURB101_0.py:44:6
+  --> FURB101.py:44:6
    |
 43 | # FURB101
 44 | with open("a.txt") as a, open("b.txt", "rb") as b:
@@ -169,7 +169,7 @@ FURB101 `open` and `read` should be replaced by `Path("a.txt").read_text()`
 help: Replace with `Path("a.txt").read_text()`
 
 FURB101 `open` and `read` should be replaced by `Path("b.txt").read_bytes()`
-  --> FURB101_0.py:44:26
+  --> FURB101.py:44:26
    |
 43 | # FURB101
 44 | with open("a.txt") as a, open("b.txt", "rb") as b:
@@ -180,7 +180,7 @@ FURB101 `open` and `read` should be replaced by `Path("b.txt").read_bytes()`
 help: Replace with `Path("b.txt").read_bytes()`
 
 FURB101 `open` and `read` should be replaced by `Path("file.txt").read_text()`
-  --> FURB101_0.py:49:18
+  --> FURB101.py:49:18
    |
 48 | # FURB101
 49 | with foo() as a, open("file.txt") as b, foo() as c:
@@ -191,7 +191,7 @@ FURB101 `open` and `read` should be replaced by `Path("file.txt").read_text()`
 help: Replace with `Path("file.txt").read_text()`
 
 FURB101 [*] `open` and `read` should be replaced by `Path("file.txt").read_text(encoding="utf-8")`
-   --> FURB101_0.py:130:6
+   --> FURB101.py:130:6
     |
 129 | # FURB101
 130 | with open("file.txt", encoding="utf-8") as f:
@@ -215,7 +215,7 @@ help: Replace with `Path("file.txt").read_text(encoding="utf-8")`
 134 | with open("file.txt", encoding="utf-8") as f:
 
 FURB101 `open` and `read` should be replaced by `Path("file.txt").read_text(encoding="utf-8")`
-   --> FURB101_0.py:134:6
+   --> FURB101.py:134:6
     |
 133 | # FURB101 but no fix because it would remove the assignment to `x`
 134 | with open("file.txt", encoding="utf-8") as f:
@@ -225,7 +225,7 @@ FURB101 `open` and `read` should be replaced by `Path("file.txt").read_text(enco
 help: Replace with `Path("file.txt").read_text(encoding="utf-8")`
 
 FURB101 `open` and `read` should be replaced by `Path("file.txt").read_text(encoding="utf-8")`
-   --> FURB101_0.py:138:6
+   --> FURB101.py:138:6
     |
 137 | # FURB101 but no fix because it would remove the `process_contents` call
 138 | with open("file.txt", encoding="utf-8") as f:
@@ -234,13 +234,13 @@ FURB101 `open` and `read` should be replaced by `Path("file.txt").read_text(enco
     |
 help: Replace with `Path("file.txt").read_text(encoding="utf-8")`
 
-FURB101 `open` and `read` should be replaced by `Path("file1.txt").read_text(encoding="utf-8")`
-   --> FURB101_0.py:141:6
+FURB101 `open` and `read` should be replaced by `Path("file.txt").read_text(encoding="utf-8")`
+   --> FURB101.py:141:6
     |
 139 |     contents = process_contents(f.read())
 140 |
-141 | with open("file1.txt", encoding="utf-8") as f:
-    |      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+141 | with open("file.txt", encoding="utf-8") as f:
+    |      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 142 |     contents: str = process_contents(f.read())
     |
-help: Replace with `Path("file1.txt").read_text(encoding="utf-8")`
+help: Replace with `Path("file.txt").read_text(encoding="utf-8")`

crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB101_FURB101_1.py.snap

@@ -1,39 +0,0 @@
----
-source: crates/ruff_linter/src/rules/refurb/mod.rs
----
-FURB101 [*] `Path.open()` followed by `read()` can be replaced by `Path("file.txt").read_text()`
- --> FURB101_1.py:4:6
-  |
-2 | from pathlib import Path
-3 |
-4 | with Path("file.txt").open() as f:
-  |      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-5 |     contents = f.read()
-  |
-help: Replace with `Path("file.txt").read_text()`
-1 | 
-2 | from pathlib import Path
-3 | 
-  - with Path("file.txt").open() as f:
-  -     contents = f.read()
-4 + contents = Path("file.txt").read_text()
-5 | 
-6 | with Path("file.txt").open("r") as f:
-7 |     contents = f.read()
-
-FURB101 [*] `Path.open()` followed by `read()` can be replaced by `Path("file.txt").read_text()`
- --> FURB101_1.py:7:6
-  |
-5 |     contents = f.read()
-6 |
-7 | with Path("file.txt").open("r") as f:
-  |      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-8 |     contents = f.read()
-  |
-help: Replace with `Path("file.txt").read_text()`
-4 | with Path("file.txt").open() as f:
-5 |     contents = f.read()
-6 | 
-  - with Path("file.txt").open("r") as f:
-  -     contents = f.read()
-7 + contents = Path("file.txt").read_text()

crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB103_FURB103.py.snap

@@ -2,7 +2,7 @@
 source: crates/ruff_linter/src/rules/refurb/mod.rs
 ---
 FURB103 [*] `open` and `write` should be replaced by `Path("file.txt").write_text("test")`
-  --> FURB103_0.py:12:6
+  --> FURB103.py:12:6
    |
 11 | # FURB103
 12 | with open("file.txt", "w") as f:
@@ -26,7 +26,7 @@ help: Replace with `Path("file.txt").write_text("test")`
 16 | with open("file.txt", "wb") as f:
 
 FURB103 [*] `open` and `write` should be replaced by `Path("file.txt").write_bytes(foobar)`
-  --> FURB103_0.py:16:6
+  --> FURB103.py:16:6
    |
 15 | # FURB103
 16 | with open("file.txt", "wb") as f:
@@ -50,7 +50,7 @@ help: Replace with `Path("file.txt").write_bytes(foobar)`
 20 | with open("file.txt", mode="wb") as f:
 
 FURB103 [*] `open` and `write` should be replaced by `Path("file.txt").write_bytes(b"abc")`
-  --> FURB103_0.py:20:6
+  --> FURB103.py:20:6
    |
 19 | # FURB103
 20 | with open("file.txt", mode="wb") as f:
@@ -74,7 +74,7 @@ help: Replace with `Path("file.txt").write_bytes(b"abc")`
 24 | with open("file.txt", "w", encoding="utf8") as f:
 
 FURB103 [*] `open` and `write` should be replaced by `Path("file.txt").write_text(foobar, encoding="utf8")`
-  --> FURB103_0.py:24:6
+  --> FURB103.py:24:6
    |
 23 | # FURB103
 24 | with open("file.txt", "w", encoding="utf8") as f:
@@ -98,7 +98,7 @@ help: Replace with `Path("file.txt").write_text(foobar, encoding="utf8")`
 28 | with open("file.txt", "w", errors="ignore") as f:
 
 FURB103 [*] `open` and `write` should be replaced by `Path("file.txt").write_text(foobar, errors="ignore")`
-  --> FURB103_0.py:28:6
+  --> FURB103.py:28:6
    |
 27 | # FURB103
 28 | with open("file.txt", "w", errors="ignore") as f:
@@ -122,7 +122,7 @@ help: Replace with `Path("file.txt").write_text(foobar, errors="ignore")`
 32 | with open("file.txt", mode="w") as f:
 
 FURB103 [*] `open` and `write` should be replaced by `Path("file.txt").write_text(foobar)`
-  --> FURB103_0.py:32:6
+  --> FURB103.py:32:6
    |
 31 | # FURB103
 32 | with open("file.txt", mode="w") as f:
@@ -146,7 +146,7 @@ help: Replace with `Path("file.txt").write_text(foobar)`
 36 | with open(foo(), "wb") as f:
 
 FURB103 `open` and `write` should be replaced by `Path(foo()).write_bytes(bar())`
-  --> FURB103_0.py:36:6
+  --> FURB103.py:36:6
    |
 35 | # FURB103
 36 | with open(foo(), "wb") as f:
@@ -157,7 +157,7 @@ FURB103 `open` and `write` should be replaced by `Path(foo()).write_bytes(bar())
 help: Replace with `Path(foo()).write_bytes(bar())`
 
 FURB103 `open` and `write` should be replaced by `Path("a.txt").write_text(x)`
-  --> FURB103_0.py:44:6
+  --> FURB103.py:44:6
    |
 43 | # FURB103
 44 | with open("a.txt", "w") as a, open("b.txt", "wb") as b:
@@ -168,7 +168,7 @@ FURB103 `open` and `write` should be replaced by `Path("a.txt").write_text(x)`
 help: Replace with `Path("a.txt").write_text(x)`
 
 FURB103 `open` and `write` should be replaced by `Path("b.txt").write_bytes(y)`
-  --> FURB103_0.py:44:31
+  --> FURB103.py:44:31
    |
 43 | # FURB103
 44 | with open("a.txt", "w") as a, open("b.txt", "wb") as b:
@@ -179,7 +179,7 @@ FURB103 `open` and `write` should be replaced by `Path("b.txt").write_bytes(y)`
 help: Replace with `Path("b.txt").write_bytes(y)`
 
 FURB103 `open` and `write` should be replaced by `Path("file.txt").write_text(bar(bar(a + x)))`
-  --> FURB103_0.py:49:18
+  --> FURB103.py:49:18
    |
 48 | # FURB103
 49 | with foo() as a, open("file.txt", "w") as b, foo() as c:
@@ -190,7 +190,7 @@ FURB103 `open` and `write` should be replaced by `Path("file.txt").write_text(ba
 help: Replace with `Path("file.txt").write_text(bar(bar(a + x)))`
 
 FURB103 [*] `open` and `write` should be replaced by `Path("file.txt").write_text(foobar, newline="\r\n")`
-  --> FURB103_0.py:58:6
+  --> FURB103.py:58:6
    |
 57 | # FURB103
 58 | with open("file.txt", "w", newline="\r\n") as f:
@@ -214,7 +214,7 @@ help: Replace with `Path("file.txt").write_text(foobar, newline="\r\n")`
 62 | import builtins
 
 FURB103 [*] `open` and `write` should be replaced by `Path("file.txt").write_text(foobar, newline="\r\n")`
-  --> FURB103_0.py:66:6
+  --> FURB103.py:66:6
    |
 65 | # FURB103
 66 | with builtins.open("file.txt", "w", newline="\r\n") as f:
@@ -237,7 +237,7 @@ help: Replace with `Path("file.txt").write_text(foobar, newline="\r\n")`
 70 | from builtins import open as o
 
 FURB103 [*] `open` and `write` should be replaced by `Path("file.txt").write_text(foobar, newline="\r\n")`
-  --> FURB103_0.py:74:6
+  --> FURB103.py:74:6
    |
 73 | # FURB103
 74 | with o("file.txt", "w", newline="\r\n") as f:
@@ -260,7 +260,7 @@ help: Replace with `Path("file.txt").write_text(foobar, newline="\r\n")`
 78 | 
 
 FURB103 [*] `open` and `write` should be replaced by `Path("test.json")....`
-   --> FURB103_0.py:154:6
+   --> FURB103.py:154:6
     |
 152 | data = {"price": 100}
 153 |
@@ -284,7 +284,7 @@ help: Replace with `Path("test.json")....`
 158 | with open("tmp_path/pyproject.toml", "w") as f:
 
 FURB103 [*] `open` and `write` should be replaced by `Path("tmp_path/pyproject.toml")....`
-   --> FURB103_0.py:158:6
+   --> FURB103.py:158:6
     |
 157 | # See: https://github.com/astral-sh/ruff/issues/21381
 158 | with open("tmp_path/pyproject.toml", "w") as f:

crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB103_FURB103_1.py.snap

@@ -1,157 +0,0 @@
----
-source: crates/ruff_linter/src/rules/refurb/mod.rs
----
-FURB103 [*] `Path.open()` followed by `write()` can be replaced by `Path("file.txt").write_text("test")`
- --> FURB103_1.py:3:6
-  |
-1 | from pathlib import Path
-2 |
-3 | with Path("file.txt").open("w") as f:
-  |      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 |     f.write("test")
-  |
-help: Replace with `Path("file.txt").write_text("test")`
-1 | from pathlib import Path
-2 | 
-  - with Path("file.txt").open("w") as f:
-  -     f.write("test")
-3 + Path("file.txt").write_text("test")
-4 | 
-5 | with Path("file.txt").open("wb") as f:
-6 |     f.write(b"test")
-
-FURB103 [*] `Path.open()` followed by `write()` can be replaced by `Path("file.txt").write_bytes(b"test")`
- --> FURB103_1.py:6:6
-  |
-4 |     f.write("test")
-5 |
-6 | with Path("file.txt").open("wb") as f:
-  |      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-7 |     f.write(b"test")
-  |
-help: Replace with `Path("file.txt").write_bytes(b"test")`
-3 | with Path("file.txt").open("w") as f:
-4 |     f.write("test")
-5 | 
-  - with Path("file.txt").open("wb") as f:
-  -     f.write(b"test")
-6 + Path("file.txt").write_bytes(b"test")
-7 | 
-8 | with Path("file.txt").open(mode="w") as f:
-9 |     f.write("test")
-
-FURB103 [*] `Path.open()` followed by `write()` can be replaced by `Path("file.txt").write_text("test")`
-  --> FURB103_1.py:9:6
-   |
- 7 |     f.write(b"test")
- 8 |
- 9 | with Path("file.txt").open(mode="w") as f:
-   |      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-10 |     f.write("test")
-   |
-help: Replace with `Path("file.txt").write_text("test")`
-6  | with Path("file.txt").open("wb") as f:
-7  |     f.write(b"test")
-8  | 
-   - with Path("file.txt").open(mode="w") as f:
-   -     f.write("test")
-9  + Path("file.txt").write_text("test")
-10 | 
-11 | with Path("file.txt").open("w", encoding="utf8") as f:
-12 |     f.write("test")
-
-FURB103 [*] `Path.open()` followed by `write()` can be replaced by `Path("file.txt").write_text("test", encoding="utf8")`
-  --> FURB103_1.py:12:6
-   |
-10 |     f.write("test")
-11 |
-12 | with Path("file.txt").open("w", encoding="utf8") as f:
-   |      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-13 |     f.write("test")
-   |
-help: Replace with `Path("file.txt").write_text("test", encoding="utf8")`
-9  | with Path("file.txt").open(mode="w") as f:
-10 |     f.write("test")
-11 | 
-   - with Path("file.txt").open("w", encoding="utf8") as f:
-   -     f.write("test")
-12 + Path("file.txt").write_text("test", encoding="utf8")
-13 | 
-14 | with Path("file.txt").open("w", errors="ignore") as f:
-15 |     f.write("test")
-
-FURB103 [*] `Path.open()` followed by `write()` can be replaced by `Path("file.txt").write_text("test", errors="ignore")`
-  --> FURB103_1.py:15:6
-   |
-13 |     f.write("test")
-14 |
-15 | with Path("file.txt").open("w", errors="ignore") as f:
-   |      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-16 |     f.write("test")
-   |
-help: Replace with `Path("file.txt").write_text("test", errors="ignore")`
-12 | with Path("file.txt").open("w", encoding="utf8") as f:
-13 |     f.write("test")
-14 | 
-   - with Path("file.txt").open("w", errors="ignore") as f:
-   -     f.write("test")
-15 + Path("file.txt").write_text("test", errors="ignore")
-16 | 
-17 | with Path(foo()).open("w") as f:
-18 |     f.write("test")
-
-FURB103 [*] `Path.open()` followed by `write()` can be replaced by `Path(foo()).write_text("test")`
-  --> FURB103_1.py:18:6
-   |
-16 |     f.write("test")
-17 |
-18 | with Path(foo()).open("w") as f:
-   |      ^^^^^^^^^^^^^^^^^^^^^^^^^^
-19 |     f.write("test")
-   |
-help: Replace with `Path(foo()).write_text("test")`
-15 | with Path("file.txt").open("w", errors="ignore") as f:
-16 |     f.write("test")
-17 | 
-   - with Path(foo()).open("w") as f:
-   -     f.write("test")
-18 + Path(foo()).write_text("test")
-19 | 
-20 | p = Path("file.txt")
-21 | with p.open("w") as f:
-
-FURB103 [*] `Path.open()` followed by `write()` can be replaced by `p.write_text("test")`
-  --> FURB103_1.py:22:6
-   |
-21 | p = Path("file.txt")
-22 | with p.open("w") as f:
-   |      ^^^^^^^^^^^^^^^^
-23 |     f.write("test")
-   |
-help: Replace with `p.write_text("test")`
-19 |     f.write("test")
-20 | 
-21 | p = Path("file.txt")
-   - with p.open("w") as f:
-   -     f.write("test")
-22 + p.write_text("test")
-23 | 
-24 | with Path("foo", "bar", "baz").open("w") as f:
-25 |     f.write("test")
-
-FURB103 [*] `Path.open()` followed by `write()` can be replaced by `Path("foo", "bar", "baz").write_text("test")`
-  --> FURB103_1.py:25:6
-   |
-23 |     f.write("test")
-24 |
-25 | with Path("foo", "bar", "baz").open("w") as f:
-   |      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-26 |     f.write("test")
-   |
-help: Replace with `Path("foo", "bar", "baz").write_text("test")`
-22 | with p.open("w") as f:
-23 |     f.write("test")
-24 | 
-   - with Path("foo", "bar", "baz").open("w") as f:
-   -     f.write("test")
-25 + Path("foo", "bar", "baz").write_text("test")

crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__write_whole_file_python_39.snap

@@ -2,7 +2,7 @@
 source: crates/ruff_linter/src/rules/refurb/mod.rs
 ---
 FURB103 [*] `open` and `write` should be replaced by `Path("file.txt").write_text("test")`
-  --> FURB103_0.py:12:6
+  --> FURB103.py:12:6
    |
 11 | # FURB103
 12 | with open("file.txt", "w") as f:
@@ -26,7 +26,7 @@ help: Replace with `Path("file.txt").write_text("test")`
 16 | with open("file.txt", "wb") as f:
 
 FURB103 [*] `open` and `write` should be replaced by `Path("file.txt").write_bytes(foobar)`
-  --> FURB103_0.py:16:6
+  --> FURB103.py:16:6
    |
 15 | # FURB103
 16 | with open("file.txt", "wb") as f:
@@ -50,7 +50,7 @@ help: Replace with `Path("file.txt").write_bytes(foobar)`
 20 | with open("file.txt", mode="wb") as f:
 
 FURB103 [*] `open` and `write` should be replaced by `Path("file.txt").write_bytes(b"abc")`
-  --> FURB103_0.py:20:6
+  --> FURB103.py:20:6
    |
 19 | # FURB103
 20 | with open("file.txt", mode="wb") as f:
@@ -74,7 +74,7 @@ help: Replace with `Path("file.txt").write_bytes(b"abc")`
 24 | with open("file.txt", "w", encoding="utf8") as f:
 
 FURB103 [*] `open` and `write` should be replaced by `Path("file.txt").write_text(foobar, encoding="utf8")`
-  --> FURB103_0.py:24:6
+  --> FURB103.py:24:6
    |
 23 | # FURB103
 24 | with open("file.txt", "w", encoding="utf8") as f:
@@ -98,7 +98,7 @@ help: Replace with `Path("file.txt").write_text(foobar, encoding="utf8")`
 28 | with open("file.txt", "w", errors="ignore") as f:
 
 FURB103 [*] `open` and `write` should be replaced by `Path("file.txt").write_text(foobar, errors="ignore")`
-  --> FURB103_0.py:28:6
+  --> FURB103.py:28:6
    |
 27 | # FURB103
 28 | with open("file.txt", "w", errors="ignore") as f:
@@ -122,7 +122,7 @@ help: Replace with `Path("file.txt").write_text(foobar, errors="ignore")`
 32 | with open("file.txt", mode="w") as f:
 
 FURB103 [*] `open` and `write` should be replaced by `Path("file.txt").write_text(foobar)`
-  --> FURB103_0.py:32:6
+  --> FURB103.py:32:6
    |
 31 | # FURB103
 32 | with open("file.txt", mode="w") as f:
@@ -146,7 +146,7 @@ help: Replace with `Path("file.txt").write_text(foobar)`
 36 | with open(foo(), "wb") as f:
 
 FURB103 `open` and `write` should be replaced by `Path(foo()).write_bytes(bar())`
-  --> FURB103_0.py:36:6
+  --> FURB103.py:36:6
    |
 35 | # FURB103
 36 | with open(foo(), "wb") as f:
@@ -157,7 +157,7 @@ FURB103 `open` and `write` should be replaced by `Path(foo()).write_bytes(bar())
 help: Replace with `Path(foo()).write_bytes(bar())`
 
 FURB103 `open` and `write` should be replaced by `Path("a.txt").write_text(x)`
-  --> FURB103_0.py:44:6
+  --> FURB103.py:44:6
    |
 43 | # FURB103
 44 | with open("a.txt", "w") as a, open("b.txt", "wb") as b:
@@ -168,7 +168,7 @@ FURB103 `open` and `write` should be replaced by `Path("a.txt").write_text(x)`
 help: Replace with `Path("a.txt").write_text(x)`
 
 FURB103 `open` and `write` should be replaced by `Path("b.txt").write_bytes(y)`
-  --> FURB103_0.py:44:31
+  --> FURB103.py:44:31
    |
 43 | # FURB103
 44 | with open("a.txt", "w") as a, open("b.txt", "wb") as b:
@@ -179,7 +179,7 @@ FURB103 `open` and `write` should be replaced by `Path("b.txt").write_bytes(y)`
 help: Replace with `Path("b.txt").write_bytes(y)`
 
 FURB103 `open` and `write` should be replaced by `Path("file.txt").write_text(bar(bar(a + x)))`
-  --> FURB103_0.py:49:18
+  --> FURB103.py:49:18
    |
 48 | # FURB103
 49 | with foo() as a, open("file.txt", "w") as b, foo() as c:
@@ -190,7 +190,7 @@ FURB103 `open` and `write` should be replaced by `Path("file.txt").write_text(ba
 help: Replace with `Path("file.txt").write_text(bar(bar(a + x)))`
 
 FURB103 [*] `open` and `write` should be replaced by `Path("test.json")....`
-   --> FURB103_0.py:154:6
+   --> FURB103.py:154:6
     |
 152 | data = {"price": 100}
 153 |
@@ -214,7 +214,7 @@ help: Replace with `Path("test.json")....`
 158 | with open("tmp_path/pyproject.toml", "w") as f:
 
 FURB103 [*] `open` and `write` should be replaced by `Path("tmp_path/pyproject.toml")....`
-   --> FURB103_0.py:158:6
+   --> FURB103.py:158:6
     |
 157 | # See: https://github.com/astral-sh/ruff/issues/21381
 158 | with open("tmp_path/pyproject.toml", "w") as f:

crates/ruff_linter/src/snapshots/ruff_linter__linter__tests__semantic_syntax_error_annotated_global.py_3.14.snap

@@ -1,74 +0,0 @@
----
-source: crates/ruff_linter/src/linter.rs
----
-invalid-syntax: annotated name `a` can't be global
- --> resources/test/fixtures/semantic_errors/annotated_global.py:4:5
-  |
-2 | def f1():
-3 |     global a
-4 |     a: str = "foo"  # error
-  |     ^
-5 |
-6 | b: int = 1
-  |
-
-invalid-syntax: annotated name `b` can't be global
-  --> resources/test/fixtures/semantic_errors/annotated_global.py:10:9
-   |
- 8 |     def inner():
- 9 |         global b
-10 |         b: str = "nested"  # error
-   |         ^
-11 |
-12 | c: int = 1
-   |
-
-invalid-syntax: annotated name `c` can't be global
-  --> resources/test/fixtures/semantic_errors/annotated_global.py:15:5
-   |
-13 | def f2():
-14 |     global c
-15 |     c: list[str] = []  # error
-   |     ^
-16 |
-17 | d: int = 1
-   |
-
-invalid-syntax: annotated name `d` can't be global
-  --> resources/test/fixtures/semantic_errors/annotated_global.py:20:5
-   |
-18 | def f3():
-19 |     global d
-20 |     d: str  # error
-   |     ^
-21 |
-22 | e: int = 1
-   |
-
-invalid-syntax: annotated name `g` can't be global
-  --> resources/test/fixtures/semantic_errors/annotated_global.py:29:1
-   |
-27 | f: int = 1  # okay
-28 |
-29 | g: int = 1
-   | ^
-30 | global g  # error
-   |
-
-invalid-syntax: annotated name `x` can't be global
-  --> resources/test/fixtures/semantic_errors/annotated_global.py:33:5
-   |
-32 | class C:
-33 |     x: str
-   |     ^
-34 |     global x  # error
-   |
-
-invalid-syntax: annotated name `x` can't be global
-  --> resources/test/fixtures/semantic_errors/annotated_global.py:38:5
-   |
-36 | class D:
-37 |     global x  # error
-38 |     x: str
-   |     ^
-   |

crates/ruff_python_ast/src/lib.rs

@@ -12,7 +12,6 @@ pub use python_version::*;
 pub mod comparable;
 pub mod docstrings;
 mod expression;
-pub mod find_node;
 mod generated;
 pub mod helpers;
 pub mod identifier;

crates/ruff_python_ast/src/traversal.rs

@@ -2,25 +2,18 @@
 use crate::{self as ast, AnyNodeRef, ExceptHandler, Stmt};
 
 /// Given a [`Stmt`] and its parent, return the [`ast::Suite`] that contains the [`Stmt`].
-pub fn suite<'a>(
-    stmt: impl Into<AnyNodeRef<'a>>,
-    parent: impl Into<AnyNodeRef<'a>>,
-) -> Option<EnclosingSuite<'a>> {
+pub fn suite<'a>(stmt: &'a Stmt, parent: &'a Stmt) -> Option<EnclosingSuite<'a>> {
     // TODO: refactor this to work without a parent, ie when `stmt` is at the top level
-    let stmt = stmt.into();
-    match parent.into() {
-        AnyNodeRef::ModModule(ast::ModModule { body, .. }) => EnclosingSuite::new(body, stmt),
-        AnyNodeRef::StmtFunctionDef(ast::StmtFunctionDef { body, .. }) => {
-            EnclosingSuite::new(body, stmt)
-        }
-        AnyNodeRef::StmtClassDef(ast::StmtClassDef { body, .. }) => EnclosingSuite::new(body, stmt),
-        AnyNodeRef::StmtFor(ast::StmtFor { body, orelse, .. }) => [body, orelse]
+    match parent {
+        Stmt::FunctionDef(ast::StmtFunctionDef { body, .. }) => EnclosingSuite::new(body, stmt),
+        Stmt::ClassDef(ast::StmtClassDef { body, .. }) => EnclosingSuite::new(body, stmt),
+        Stmt::For(ast::StmtFor { body, orelse, .. }) => [body, orelse]
             .iter()
             .find_map(|suite| EnclosingSuite::new(suite, stmt)),
-        AnyNodeRef::StmtWhile(ast::StmtWhile { body, orelse, .. }) => [body, orelse]
+        Stmt::While(ast::StmtWhile { body, orelse, .. }) => [body, orelse]
             .iter()
             .find_map(|suite| EnclosingSuite::new(suite, stmt)),
-        AnyNodeRef::StmtIf(ast::StmtIf {
+        Stmt::If(ast::StmtIf {
             body,
             elif_else_clauses,
             ..
@@ -28,12 +21,12 @@ pub fn suite<'a>(
             .into_iter()
             .chain(elif_else_clauses.iter().map(|clause| &clause.body))
             .find_map(|suite| EnclosingSuite::new(suite, stmt)),
-        AnyNodeRef::StmtWith(ast::StmtWith { body, .. }) => EnclosingSuite::new(body, stmt),
-        AnyNodeRef::StmtMatch(ast::StmtMatch { cases, .. }) => cases
+        Stmt::With(ast::StmtWith { body, .. }) => EnclosingSuite::new(body, stmt),
+        Stmt::Match(ast::StmtMatch { cases, .. }) => cases
             .iter()
             .map(|case| &case.body)
             .find_map(|body| EnclosingSuite::new(body, stmt)),
-        AnyNodeRef::StmtTry(ast::StmtTry {
+        Stmt::Try(ast::StmtTry {
             body,
             handlers,
             orelse,
@@ -58,10 +51,10 @@ pub struct EnclosingSuite<'a> {
 }
 
 impl<'a> EnclosingSuite<'a> {
-    pub fn new(suite: &'a [Stmt], stmt: AnyNodeRef<'a>) -> Option<Self> {
+    pub fn new(suite: &'a [Stmt], stmt: &'a Stmt) -> Option<Self> {
         let position = suite
             .iter()
-            .position(|sibling| AnyNodeRef::ptr_eq(sibling.into(), stmt))?;
+            .position(|sibling| AnyNodeRef::ptr_eq(sibling.into(), stmt.into()))?;
 
         Some(EnclosingSuite { suite, position })
     }

crates/ruff_python_ast/src/visitor/source_order.rs

@@ -222,17 +222,6 @@ where
     visitor.leave_node(node);
 }
 
-pub fn walk_node<'a, V>(visitor: &mut V, node: AnyNodeRef<'a>)
-where
-    V: SourceOrderVisitor<'a> + ?Sized,
-{
-    if visitor.enter_node(node).is_traverse() {
-        node.visit_source_order(visitor);
-    }
-
-    visitor.leave_node(node);
-}
-
 #[derive(Copy, Clone, Eq, PartialEq, Debug)]
 pub enum TraversalSignal {
     Traverse,

crates/ruff_python_literal/src/format.rs

@@ -592,23 +592,11 @@ impl FormatString {
     fn parse_literal(text: &str) -> Result<(FormatPart, &str), FormatParseError> {
         let mut cur_text = text;
         let mut result_string = String::new();
-        let mut pending_escape = false;
         while !cur_text.is_empty() {
-            if pending_escape
-                && let Some((unicode_string, remaining)) =
-                    FormatString::parse_escaped_unicode_string(cur_text)
-            {
-                result_string.push_str(unicode_string);
-                cur_text = remaining;
-                pending_escape = false;
-                continue;
-            }
-
             match FormatString::parse_literal_single(cur_text) {
                 Ok((next_char, remaining)) => {
                     result_string.push(next_char);
                     cur_text = remaining;
-                    pending_escape = next_char == '\\' && !pending_escape;
                 }
                 Err(err) => {
                     return if result_string.is_empty() {
@@ -690,13 +678,6 @@ impl FormatString {
         }
         Err(FormatParseError::UnmatchedBracket)
     }
-
-    fn parse_escaped_unicode_string(text: &str) -> Option<(&str, &str)> {
-        text.strip_prefix("N{")?.find('}').map(|idx| {
-            let end_idx = idx + 3; // 3 for "N{"
-            (&text[..end_idx], &text[end_idx..])
-        })
-    }
 }
 
 pub trait FromTemplate<'a>: Sized {
@@ -1039,48 +1020,4 @@ mod tests {
             Err(FormatParseError::InvalidCharacterAfterRightBracket)
         );
     }
-
-    #[test]
-    fn test_format_unicode_escape() {
-        let expected = Ok(FormatString {
-            format_parts: vec![FormatPart::Literal("I am a \\N{snowman}".to_owned())],
-        });
-
-        assert_eq!(FormatString::from_str("I am a \\N{snowman}"), expected);
-    }
-
-    #[test]
-    fn test_format_unicode_escape_with_field() {
-        let expected = Ok(FormatString {
-            format_parts: vec![
-                FormatPart::Literal("I am a \\N{snowman}".to_owned()),
-                FormatPart::Field {
-                    field_name: "snowman".to_owned(),
-                    conversion_spec: None,
-                    format_spec: String::new(),
-                },
-            ],
-        });
-
-        assert_eq!(
-            FormatString::from_str("I am a \\N{snowman}{snowman}"),
-            expected
-        );
-    }
-
-    #[test]
-    fn test_format_multiple_escape_with_field() {
-        let expected = Ok(FormatString {
-            format_parts: vec![
-                FormatPart::Literal("I am a \\\\N".to_owned()),
-                FormatPart::Field {
-                    field_name: "snowman".to_owned(),
-                    conversion_spec: None,
-                    format_spec: String::new(),
-                },
-            ],
-        });
-
-        assert_eq!(FormatString::from_str("I am a \\\\N{snowman}"), expected);
-    }
 }

crates/ruff_python_parser/src/semantic_errors.rs

@@ -272,9 +272,7 @@ impl SemanticSyntaxChecker {
 
     fn check_annotation<Ctx: SemanticSyntaxContext>(stmt: &ast::Stmt, ctx: &Ctx) {
         match stmt {
-            Stmt::AnnAssign(ast::StmtAnnAssign {
-                target, annotation, ..
-            }) => {
+            Stmt::AnnAssign(ast::StmtAnnAssign { annotation, .. }) => {
                 if ctx.python_version() > PythonVersion::PY313 {
                     // test_ok valid_annotation_py313
                     // # parse_options: {"target-version": "3.13"}
@@ -299,18 +297,6 @@ impl SemanticSyntaxChecker {
                     };
                     visitor.visit_expr(annotation);
                 }
-                if let Expr::Name(ast::ExprName { id, .. }) = target.as_ref() {
-                    if let Some(global_stmt) = ctx.global(id.as_str()) {
-                        let global_start = global_stmt.start();
-                        if !ctx.in_module_scope() || target.start() < global_start {
-                            Self::add_error(
-                                ctx,
-                                SemanticSyntaxErrorKind::AnnotatedGlobal(id.to_string()),
-                                target.range(),
-                            );
-                        }
-                    }
-                }
             }
             Stmt::FunctionDef(ast::StmtFunctionDef {
                 type_params,

crates/ruff_source_file/src/line_index.rs

@@ -179,45 +179,42 @@ impl LineIndex {
         let line = self.line_index(offset);
         let line_start = self.line_start(line, text);
 
-        let character_offset =
-            self.characters_between(TextRange::new(line_start, offset), text, encoding);
-
-        SourceLocation {
-            line,
-            character_offset: OneIndexed::from_zero_indexed(character_offset),
-        }
-    }
-
-    fn characters_between(
-        &self,
-        range: TextRange,
-        text: &str,
-        encoding: PositionEncoding,
-    ) -> usize {
         if self.is_ascii() {
-            return (range.end() - range.start()).to_usize();
+            return SourceLocation {
+                line,
+                character_offset: OneIndexed::from_zero_indexed((offset - line_start).to_usize()),
+            };
         }
 
         match encoding {
-            PositionEncoding::Utf8 => (range.end() - range.start()).to_usize(),
+            PositionEncoding::Utf8 => {
+                let character_offset = offset - line_start;
+                SourceLocation {
+                    line,
+                    character_offset: OneIndexed::from_zero_indexed(character_offset.to_usize()),
+                }
+            }
             PositionEncoding::Utf16 => {
-                let up_to_character = &text[range];
-                up_to_character.encode_utf16().count()
+                let up_to_character = &text[TextRange::new(line_start, offset)];
+                let character = up_to_character.encode_utf16().count();
+
+                SourceLocation {
+                    line,
+                    character_offset: OneIndexed::from_zero_indexed(character),
+                }
             }
             PositionEncoding::Utf32 => {
-                let up_to_character = &text[range];
-                up_to_character.chars().count()
+                let up_to_character = &text[TextRange::new(line_start, offset)];
+                let character = up_to_character.chars().count();
+
+                SourceLocation {
+                    line,
+                    character_offset: OneIndexed::from_zero_indexed(character),
+                }
             }
         }
     }
 
-    /// Returns the length of the line in characters, respecting the given encoding
-    pub fn line_len(&self, line: OneIndexed, text: &str, encoding: PositionEncoding) -> usize {
-        let line_range = self.line_range(line, text);
-
-        self.characters_between(line_range, text, encoding)
-    }
-
     /// Return the number of lines in the source code.
     pub fn line_count(&self) -> usize {
         self.line_starts().len()

crates/ruff_wasm/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ruff_wasm"
-version = "0.14.10"
+version = "0.14.9"
 publish = false
 authors = { workspace = true }
 edition = { workspace = true }

crates/ty/docs/configuration.md

@@ -200,22 +200,24 @@ Configuration override that applies to specific files based on glob patterns.
 
 An override allows you to apply different rule configurations to specific
 files or directories. Multiple overrides can match the same file, with
-later overrides take precedence. Override rules take precedence over global
-rules for matching files.
+later overrides take precedence.
 
-For example, to relax enforcement of rules in test files:
+### Precedence
+
+- Later overrides in the array take precedence over earlier ones
+- Override rules take precedence over global rules for matching files
+
+### Examples
 
 ```toml
+# Relax rules for test files
 [[tool.ty.overrides]]
 include = ["tests/**", "**/test_*.py"]
 
 [tool.ty.overrides.rules]
 possibly-unresolved-reference = "warn"
-```
 
-Or, to ignore a rule in generated files but retain enforcement in an important file:
-
-```toml
+# Ignore generated files but still check important ones
 [[tool.ty.overrides]]
 include = ["generated/**"]
 exclude = ["generated/important.py"]

crates/ty/docs/environment.md

@@ -2,15 +2,6 @@
 
 ty defines and respects the following environment variables:
 
-### `TY_CONFIG_FILE`
-
-Path to a `ty.toml` configuration file to use.
-
-When set, ty will use this file for configuration instead of
-discovering configuration files automatically.
-
-Equivalent to the `--config-file` command-line argument.
-
 ### `TY_LOG`
 
 If set, ty will use this value as the log level for its `--verbose` output.

crates/ty/src/args.rs

@@ -9,7 +9,6 @@ use ty_combine::Combine;
 use ty_project::metadata::options::{EnvironmentOptions, Options, SrcOptions, TerminalOptions};
 use ty_project::metadata::value::{RangedValue, RelativeGlobPattern, RelativePathBuf, ValueSource};
 use ty_python_semantic::lint;
-use ty_static::EnvVars;
 
 // Configures Clap v3-style help menu colors
 const STYLES: Styles = Styles::styled()
@@ -122,7 +121,7 @@ pub(crate) struct CheckCommand {
     /// The path to a `ty.toml` file to use for configuration.
     ///
     /// While ty configuration can be included in a `pyproject.toml` file, it is not allowed in this context.
-    #[arg(long, env = EnvVars::TY_CONFIG_FILE, value_name = "PATH")]
+    #[arg(long, env = "TY_CONFIG_FILE", value_name = "PATH")]
     pub(crate) config_file: Option<SystemPathBuf>,
 
     /// The format to use for printing diagnostic messages.

crates/ty/tests/cli/python_environment.rs

@@ -2703,51 +2703,3 @@ fn pythonpath_multiple_dirs_is_respected() -> anyhow::Result<()> {
 
     Ok(())
 }
-
-/// Test behavior when `VIRTUAL_ENV` is set but points to a non-existent path.
-#[test]
-fn missing_virtual_env() -> anyhow::Result<()> {
-    let working_venv_package1_path = if cfg!(windows) {
-        "project/.venv/Lib/site-packages/package1/__init__.py"
-    } else {
-        "project/.venv/lib/python3.13/site-packages/package1/__init__.py"
-    };
-
-    let case = CliTest::with_files([
-        (
-            "project/test.py",
-            r#"
-            from package1 import WorkingVenv
-            "#,
-        ),
-        (
-            "project/.venv/pyvenv.cfg",
-            r#"
-home = ./
-
-            "#,
-        ),
-        (
-            working_venv_package1_path,
-            r#"
-            class WorkingVenv: ...
-            "#,
-        ),
-    ])?;
-
-    assert_cmd_snapshot!(case.command()
-        .current_dir(case.root().join("project"))
-        .env("VIRTUAL_ENV", case.root().join("nonexistent-venv")), @r"
-    success: false
-    exit_code: 2
-    ----- stdout -----
-
-    ----- stderr -----
-    ty failed
-      Cause: Failed to discover local Python environment
-      Cause: Invalid `VIRTUAL_ENV` environment variable `<temp_dir>/nonexistent-venv`: does not point to a directory on disk
-      Cause: No such file or directory (os error 2)
-    ");
-
-    Ok(())
-}

crates/ty_completion_eval/completion-evaluation-tasks.csv

@@ -15,7 +15,7 @@ import-deprioritizes-type_check_only,main.py,3,2
 import-deprioritizes-type_check_only,main.py,4,3
 import-keyword-completion,main.py,0,1
 internal-typeshed-hidden,main.py,0,2
-none-completion,main.py,0,1
+none-completion,main.py,0,2
 numpy-array,main.py,0,159
 numpy-array,main.py,1,1
 object-attr-instance-methods,main.py,0,1

crates/ty_ide/src/code_action.rs

@@ -1,8 +1,7 @@
-use crate::completion;
+use crate::{completion, find_node::covering_node};
 
 use ruff_db::{files::File, parsed::parsed_module};
 use ruff_diagnostics::Edit;
-use ruff_python_ast::find_node::covering_node;
 use ruff_text_size::TextRange;
 use ty_project::Db;
 use ty_python_semantic::create_suppression_fix;

crates/ty_ide/src/find_node.rs

@@ -1,5 +1,5 @@
-use crate::AnyNodeRef;
-use crate::visitor::source_order::{SourceOrderVisitor, TraversalSignal, walk_node};
+use ruff_python_ast::AnyNodeRef;
+use ruff_python_ast::visitor::source_order::{SourceOrderVisitor, TraversalSignal};
 use ruff_text_size::{Ranged, TextRange};
 use std::fmt;
 use std::fmt::Formatter;
@@ -11,7 +11,7 @@ use std::fmt::Formatter;
 ///
 /// ## Panics
 /// Panics if `range` is not contained within `root`.
-pub fn covering_node(root: AnyNodeRef, range: TextRange) -> CoveringNode {
+pub(crate) fn covering_node(root: AnyNodeRef, range: TextRange) -> CoveringNode {
     struct Visitor<'a> {
         range: TextRange,
         found: bool,
@@ -48,12 +48,15 @@ pub fn covering_node(root: AnyNodeRef, range: TextRange) -> CoveringNode {
         ancestors: Vec::new(),
     };
 
-    walk_node(&mut visitor, root);
+    root.visit_source_order(&mut visitor);
+    if visitor.ancestors.is_empty() {
+        visitor.ancestors.push(root);
+    }
     CoveringNode::from_ancestors(visitor.ancestors)
 }
 
 /// The node with a minimal range that fully contains the search range.
-pub struct CoveringNode<'a> {
+pub(crate) struct CoveringNode<'a> {
     /// The covering node, along with all of its ancestors up to the
     /// root. The root is always the first element and the covering
     /// node found is always the last node. This sequence is guaranteed
@@ -64,12 +67,12 @@ pub struct CoveringNode<'a> {
 impl<'a> CoveringNode<'a> {
     /// Creates a new `CoveringNode` from a list of ancestor nodes.
     /// The ancestors should be ordered from root to the covering node.
-    pub fn from_ancestors(ancestors: Vec<AnyNodeRef<'a>>) -> Self {
+    pub(crate) fn from_ancestors(ancestors: Vec<AnyNodeRef<'a>>) -> Self {
         Self { nodes: ancestors }
     }
 
     /// Returns the covering node found.
-    pub fn node(&self) -> AnyNodeRef<'a> {
+    pub(crate) fn node(&self) -> AnyNodeRef<'a> {
         *self
             .nodes
             .last()
@@ -77,7 +80,7 @@ impl<'a> CoveringNode<'a> {
     }
 
     /// Returns the node's parent.
-    pub fn parent(&self) -> Option<AnyNodeRef<'a>> {
+    pub(crate) fn parent(&self) -> Option<AnyNodeRef<'a>> {
         let penultimate = self.nodes.len().checked_sub(2)?;
         self.nodes.get(penultimate).copied()
     }
@@ -87,7 +90,7 @@ impl<'a> CoveringNode<'a> {
     ///
     /// The "first" here means that the node closest to a leaf is
     /// returned.
-    pub fn find_first(mut self, f: impl Fn(AnyNodeRef<'a>) -> bool) -> Result<Self, Self> {
+    pub(crate) fn find_first(mut self, f: impl Fn(AnyNodeRef<'a>) -> bool) -> Result<Self, Self> {
         let Some(index) = self.find_first_index(f) else {
             return Err(self);
         };
@@ -102,7 +105,7 @@ impl<'a> CoveringNode<'a> {
     /// the highest ancestor found satisfying the given predicate is
     /// returned. Note that this is *not* the same as finding the node
     /// closest to the root that satisfies the given predictate.
-    pub fn find_last(mut self, f: impl Fn(AnyNodeRef<'a>) -> bool) -> Result<Self, Self> {
+    pub(crate) fn find_last(mut self, f: impl Fn(AnyNodeRef<'a>) -> bool) -> Result<Self, Self> {
         let Some(mut index) = self.find_first_index(&f) else {
             return Err(self);
         };
@@ -115,7 +118,7 @@ impl<'a> CoveringNode<'a> {
 
     /// Returns an iterator over the ancestor nodes, starting with the node itself
     /// and walking towards the root.
-    pub fn ancestors(&self) -> impl DoubleEndedIterator<Item = AnyNodeRef<'a>> + '_ {
+    pub(crate) fn ancestors(&self) -> impl DoubleEndedIterator<Item = AnyNodeRef<'a>> + '_ {
         self.nodes.iter().copied().rev()
     }
 

crates/ty_ide/src/goto.rs

@@ -5,9 +5,9 @@ pub use crate::goto_type_definition::goto_type_definition;
 
 use std::borrow::Cow;
 
+use crate::find_node::covering_node;
 use crate::stub_mapping::StubMapper;
 use ruff_db::parsed::ParsedModuleRef;
-use ruff_python_ast::find_node::{CoveringNode, covering_node};
 use ruff_python_ast::token::{TokenKind, Tokens};
 use ruff_python_ast::{self as ast, AnyNodeRef};
 use ruff_text_size::{Ranged, TextRange, TextSize};
@@ -665,7 +665,7 @@ impl GotoTarget<'_> {
     /// Creates a `GotoTarget` from a `CoveringNode` and an offset within the node
     pub(crate) fn from_covering_node<'a>(
         model: &SemanticModel,
-        covering_node: &CoveringNode<'a>,
+        covering_node: &crate::find_node::CoveringNode<'a>,
         offset: TextSize,
         tokens: &Tokens,
     ) -> Option<GotoTarget<'a>> {

crates/ty_ide/src/goto_declaration.rs

@@ -386,29 +386,6 @@ FOO = 0
         ");
     }
 
-    #[test]
-    fn goto_declaration_from_import_rhs_is_module() {
-        let test = CursorTest::builder()
-            .source("lib/__init__.py", r#""#)
-            .source("lib/module.py", r#""#)
-            .source("main.py", r#"from lib import module<CURSOR>"#)
-            .build();
-
-        // Should resolve to the actual function definition, not the import statement
-        assert_snapshot!(test.goto_declaration(), @r"
-        info[goto-declaration]: Go to declaration
-         --> main.py:1:17
-          |
-        1 | from lib import module
-          |                 ^^^^^^ Clicking here
-          |
-        info: Found 1 declaration
-        --> lib/module.py:1:1
-         |
-         |
-        ");
-    }
-
     #[test]
     fn goto_declaration_from_import_as() {
         let test = CursorTest::builder()

crates/ty_ide/src/hover.rs

@@ -151,19 +151,14 @@ impl fmt::Display for DisplayHoverContent<'_, '_> {
                     Some(TypeVarVariance::Bivariant) => " (bivariant)",
                     None => "",
                 };
-
-                // Special types like `<special-form of whatever 'blahblah' with 'florps'>`
-                // render poorly with python syntax-highlighting but well as xml
-                let ty_string = ty
-                    .display_with(self.db, DisplaySettings::default().multiline())
-                    .to_string();
-                let syntax = if ty_string.starts_with('<') {
-                    "xml"
-                } else {
-                    "python"
-                };
                 self.kind
-                    .fenced_code_block(format!("{ty_string}{variance}"), syntax)
+                    .fenced_code_block(
+                        format!(
+                            "{}{variance}",
+                            ty.display_with(self.db, DisplaySettings::default().multiline())
+                        ),
+                        "python",
+                    )
                     .fmt(f)
             }
             HoverContent::Docstring(docstring) => docstring.render(self.kind).fmt(f),
@@ -187,42 +182,29 @@ mod tests {
         let test = cursor_test(
             r#"
         a = 10
-        """This is the docs for this value
-
-        Wow these are good docs!
-        """
 
         a<CURSOR>
         "#,
         );
 
-        assert_snapshot!(test.hover(), @r#"
+        assert_snapshot!(test.hover(), @r"
         Literal[10]
-        ---------------------------------------------
-        This is the docs for this value
-
-        Wow these are good docs!
-
         ---------------------------------------------
         ```python
         Literal[10]
         ```
-        ---
-        This is the docs for this value  
-          
-        Wow these are good docs!
         ---------------------------------------------
         info[hover]: Hovered content is
-         --> main.py:8:1
+         --> main.py:4:1
           |
-        6 | """
-        7 |
-        8 | a
+        2 | a = 10
+        3 |
+        4 | a
           | ^- Cursor offset
           | |
           | source
           |
-        "#);
+        ");
     }
 
     #[test]
@@ -376,7 +358,7 @@ mod tests {
         Everyone loves my class!!
 
         ---------------------------------------------
-        ```xml
+        ```python
         <class 'MyClass'>
         ```
         ---
@@ -438,7 +420,7 @@ mod tests {
         Everyone loves my class!!
 
         ---------------------------------------------
-        ```xml
+        ```python
         <class 'MyClass'>
         ```
         ---
@@ -498,7 +480,7 @@ mod tests {
         initializes MyClass (perfectly)
 
         ---------------------------------------------
-        ```xml
+        ```python
         <class 'MyClass'>
         ```
         ---
@@ -554,7 +536,7 @@ mod tests {
         initializes MyClass (perfectly)
 
         ---------------------------------------------
-        ```xml
+        ```python
         <class 'MyClass'>
         ```
         ---
@@ -613,7 +595,7 @@ mod tests {
         Everyone loves my class!!
 
         ---------------------------------------------
-        ```xml
+        ```python
         <class 'MyClass'>
         ```
         ---
@@ -716,10 +698,6 @@ mod tests {
 
             def __init__(a: int, b: str):
                 self.a = a
-                """This is the docs for this value
-
-                Wow these are good docs!
-                """
                 self.b: str = b
 
         foo = Foo()
@@ -735,10 +713,10 @@ mod tests {
         ```
         ---------------------------------------------
         info[hover]: Hovered content is
-          --> main.py:14:5
+          --> main.py:10:5
            |
-        13 | foo = Foo()
-        14 | foo.a
+         9 | foo = Foo()
+        10 | foo.a
            |     -
            |     |
            |     source
@@ -1200,13 +1178,13 @@ def ab(a: str): ...
             .build();
 
         assert_snapshot!(test.hover(), @r"
-        def ab(a: int) -> Unknown
+        (a: int) -> Unknown
         ---------------------------------------------
         the int overload
 
         ---------------------------------------------
         ```python
-        def ab(a: int) -> Unknown
+        (a: int) -> Unknown
         ```
         ---
         the int overload
@@ -1260,13 +1238,13 @@ def ab(a: str):
             .build();
 
         assert_snapshot!(test.hover(), @r#"
-        def ab(a: str) -> Unknown
+        (a: str) -> Unknown
         ---------------------------------------------
         the int overload
 
         ---------------------------------------------
         ```python
-        def ab(a: str) -> Unknown
+        (a: str) -> Unknown
         ```
         ---
         the int overload
@@ -1320,7 +1298,7 @@ def ab(a: int):
             .build();
 
         assert_snapshot!(test.hover(), @r"
-        def ab(
+        (
             a: int,
             b: int
         ) -> Unknown
@@ -1329,7 +1307,7 @@ def ab(a: int):
 
         ---------------------------------------------
         ```python
-        def ab(
+        (
             a: int,
             b: int
         ) -> Unknown
@@ -1386,13 +1364,13 @@ def ab(a: int):
             .build();
 
         assert_snapshot!(test.hover(), @r"
-        def ab(a: int) -> Unknown
+        (a: int) -> Unknown
         ---------------------------------------------
         the two arg overload
 
         ---------------------------------------------
         ```python
-        def ab(a: int) -> Unknown
+        (a: int) -> Unknown
         ```
         ---
         the two arg overload
@@ -1450,7 +1428,7 @@ def ab(a: int, *, c: int):
             .build();
 
         assert_snapshot!(test.hover(), @r"
-        def ab(
+        (
             a: int,
             *,
             b: int
@@ -1460,7 +1438,7 @@ def ab(a: int, *, c: int):
 
         ---------------------------------------------
         ```python
-        def ab(
+        (
             a: int,
             *,
             b: int
@@ -1522,7 +1500,7 @@ def ab(a: int, *, c: int):
             .build();
 
         assert_snapshot!(test.hover(), @r"
-        def ab(
+        (
             a: int,
             *,
             c: int
@@ -1532,7 +1510,7 @@ def ab(a: int, *, c: int):
 
         ---------------------------------------------
         ```python
-        def ab(
+        (
             a: int,
             *,
             c: int
@@ -1581,11 +1559,11 @@ def ab(a: int, *, c: int):
         );
 
         assert_snapshot!(test.hover(), @r#"
-        def foo(
+        (
             a: int,
             b
         ) -> Unknown
-        def foo(
+        (
             a: str,
             b
         ) -> Unknown
@@ -1594,11 +1572,11 @@ def ab(a: int, *, c: int):
 
         ---------------------------------------------
         ```python
-        def foo(
+        (
             a: int,
             b
         ) -> Unknown
-        def foo(
+        (
             a: str,
             b
         ) -> Unknown
@@ -1645,15 +1623,15 @@ def ab(a: int, *, c: int):
         );
 
         assert_snapshot!(test.hover(), @r#"
-        def foo(a: int) -> Unknown
-        def foo(a: str) -> Unknown
+        (a: int) -> Unknown
+        (a: str) -> Unknown
         ---------------------------------------------
         The first overload
 
         ---------------------------------------------
         ```python
-        def foo(a: int) -> Unknown
-        def foo(a: str) -> Unknown
+        (a: int) -> Unknown
+        (a: str) -> Unknown
         ```
         ---
         The first overload
@@ -1702,7 +1680,7 @@ def ab(a: int, *, c: int):
         Wow this module rocks.
 
         ---------------------------------------------
-        ```xml
+        ```python
         <module 'lib'>
         ```
         ---
@@ -2051,7 +2029,7 @@ def function():
         assert_snapshot!(test.hover(), @r"
         <class 'Click'>
         ---------------------------------------------
-        ```xml
+        ```python
         <class 'Click'>
         ```
         ---------------------------------------------
@@ -2256,7 +2234,7 @@ def function():
         Wow this module rocks.
 
         ---------------------------------------------
-        ```xml
+        ```python
         <module 'lib'>
         ```
         ---
@@ -2362,28 +2340,15 @@ def function():
         let test = cursor_test(
             r#"
             value<CURSOR> = 1
-            """This is the docs for this value
-
-            Wow these are good docs!
-            """
             "#,
         );
 
-        assert_snapshot!(test.hover(), @r#"
+        assert_snapshot!(test.hover(), @r"
         Literal[1]
-        ---------------------------------------------
-        This is the docs for this value
-
-        Wow these are good docs!
-
         ---------------------------------------------
         ```python
         Literal[1]
         ```
-        ---
-        This is the docs for this value  
-          
-        Wow these are good docs!
         ---------------------------------------------
         info[hover]: Hovered content is
          --> main.py:2:1
@@ -2392,9 +2357,8 @@ def function():
           | ^^^^^- Cursor offset
           | |
           | source
-        3 | """This is the docs for this value
           |
-        "#);
+        ");
     }
 
     #[test]
@@ -2402,15 +2366,7 @@ def function():
         let test = cursor_test(
             r#"
             value = 1
-            """This is the docs for this value
-
-            Wow these are good docs!
-            """
             value<CURSOR> += 2
-            """Other docs???
-
-            Is this allowed???
-            """
             "#,
         );
 
@@ -2418,34 +2374,23 @@ def function():
         // Showing the new value might be more intuitive for some users, but the actual 'use'
         // of the `value` symbol here in read-context is `1`. This comment mainly exists to
         // signal that it might be okay to revisit this in the future and reveal 3 instead.
-        assert_snapshot!(test.hover(), @r#"
+        assert_snapshot!(test.hover(), @r"
         Literal[1]
-        ---------------------------------------------
-        This is the docs for this value
-
-        Wow these are good docs!
-
         ---------------------------------------------
         ```python
         Literal[1]
         ```
-        ---
-        This is the docs for this value  
-          
-        Wow these are good docs!
         ---------------------------------------------
         info[hover]: Hovered content is
-         --> main.py:7:1
+         --> main.py:3:1
           |
-        5 | Wow these are good docs!
-        6 | """
-        7 | value += 2
+        2 | value = 1
+        3 | value += 2
           | ^^^^^- Cursor offset
           | |
           | source
-        8 | """Other docs???
           |
-        "#);
+        ");
     }
 
     #[test]
@@ -2454,47 +2399,29 @@ def function():
             r#"
             class C:
                 attr: int = 1
-                """This is the docs for this value
-
-                Wow these are good docs!
-                """
 
             C.attr<CURSOR> = 2
-            """Other docs???
-
-            Is this allowed???
-            """
             "#,
         );
 
-        assert_snapshot!(test.hover(), @r#"
+        assert_snapshot!(test.hover(), @r"
         Literal[2]
-        ---------------------------------------------
-        This is the docs for this value
-
-        Wow these are good docs!
-
         ---------------------------------------------
         ```python
         Literal[2]
         ```
-        ---
-        This is the docs for this value  
-          
-        Wow these are good docs!
         ---------------------------------------------
         info[hover]: Hovered content is
-          --> main.py:9:3
-           |
-         7 |     """
-         8 |
-         9 | C.attr = 2
-           |   ^^^^- Cursor offset
-           |   |
-           |   source
-        10 | """Other docs???
-           |
-        "#);
+         --> main.py:5:3
+          |
+        3 |     attr: int = 1
+        4 |
+        5 | C.attr = 2
+          |   ^^^^- Cursor offset
+          |   |
+          |   source
+          |
+        ");
     }
 
     #[test]
@@ -2503,49 +2430,31 @@ def function():
             r#"
             class C:
                 attr = 1
-                """This is the docs for this value
-
-                Wow these are good docs!
-                """
 
             C.attr<CURSOR> += 2
-            """Other docs???
-
-            Is this allowed???
-            """
             "#,
         );
 
         // See the comment in the `hover_augmented_assignment` test above. The same
         // reasoning applies here.
-        assert_snapshot!(test.hover(), @r#"
+        assert_snapshot!(test.hover(), @r"
         Unknown | Literal[1]
-        ---------------------------------------------
-        This is the docs for this value
-
-        Wow these are good docs!
-
         ---------------------------------------------
         ```python
         Unknown | Literal[1]
         ```
-        ---
-        This is the docs for this value  
-          
-        Wow these are good docs!
         ---------------------------------------------
         info[hover]: Hovered content is
-          --> main.py:9:3
-           |
-         7 |     """
-         8 |
-         9 | C.attr += 2
-           |   ^^^^- Cursor offset
-           |   |
-           |   source
-        10 | """Other docs???
-           |
-        "#);
+         --> main.py:5:3
+          |
+        3 |     attr = 1
+        4 |
+        5 | C.attr += 2
+          |   ^^^^- Cursor offset
+          |   |
+          |   source
+          |
+        ");
     }
 
     #[test]
@@ -2554,28 +2463,15 @@ def function():
             r#"
         class Foo:
             a<CURSOR>: int
-            """This is the docs for this value
-
-            Wow these are good docs!
-            """
         "#,
         );
 
-        assert_snapshot!(test.hover(), @r#"
+        assert_snapshot!(test.hover(), @r"
         int
-        ---------------------------------------------
-        This is the docs for this value
-
-        Wow these are good docs!
-
         ---------------------------------------------
         ```python
         int
         ```
-        ---
-        This is the docs for this value  
-          
-        Wow these are good docs!
         ---------------------------------------------
         info[hover]: Hovered content is
          --> main.py:3:5
@@ -2585,9 +2481,8 @@ def function():
           |     ^- Cursor offset
           |     |
           |     source
-        4 |     """This is the docs for this value
           |
-        "#);
+        ");
     }
 
     #[test]
@@ -2596,28 +2491,15 @@ def function():
             r#"
         class Foo:
             a<CURSOR>: int = 1
-            """This is the docs for this value
-
-            Wow these are good docs!
-            """
         "#,
         );
 
-        assert_snapshot!(test.hover(), @r#"
+        assert_snapshot!(test.hover(), @r"
         Literal[1]
-        ---------------------------------------------
-        This is the docs for this value
-
-        Wow these are good docs!
-
         ---------------------------------------------
         ```python
         Literal[1]
         ```
-        ---
-        This is the docs for this value  
-          
-        Wow these are good docs!
         ---------------------------------------------
         info[hover]: Hovered content is
          --> main.py:3:5
@@ -2627,52 +2509,7 @@ def function():
           |     ^- Cursor offset
           |     |
           |     source
-        4 |     """This is the docs for this value
           |
-        "#);
-    }
-
-    #[test]
-    fn hover_annotated_assignment_with_rhs_use() {
-        let test = cursor_test(
-            r#"
-        class Foo:
-            a: int = 1
-            """This is the docs for this value
-
-            Wow these are good docs!
-            """
-        
-        x = Foo()
-        x.a<CURSOR>
-        "#,
-        );
-
-        assert_snapshot!(test.hover(), @r"
-        int
-        ---------------------------------------------
-        This is the docs for this value
-
-        Wow these are good docs!
-
-        ---------------------------------------------
-        ```python
-        int
-        ```
-        ---
-        This is the docs for this value  
-          
-        Wow these are good docs!
-        ---------------------------------------------
-        info[hover]: Hovered content is
-          --> main.py:10:3
-           |
-         9 | x = Foo()
-        10 | x.a
-           |   ^- Cursor offset
-           |   |
-           |   source
-           |
         ");
     }
 
@@ -2683,28 +2520,15 @@ def function():
         class Foo:
             def __init__(self, a: int):
                 self.a<CURSOR>: int = a
-                """This is the docs for this value
-
-                Wow these are good docs!
-                """
         "#,
         );
 
-        assert_snapshot!(test.hover(), @r#"
+        assert_snapshot!(test.hover(), @r"
         int
-        ---------------------------------------------
-        This is the docs for this value
-
-        Wow these are good docs!
-
         ---------------------------------------------
         ```python
         int
         ```
-        ---
-        This is the docs for this value  
-          
-        Wow these are good docs!
         ---------------------------------------------
         info[hover]: Hovered content is
          --> main.py:4:14
@@ -2715,53 +2539,7 @@ def function():
           |              ^- Cursor offset
           |              |
           |              source
-        5 |         """This is the docs for this value
           |
-        "#);
-    }
-
-    #[test]
-    fn hover_annotated_attribute_assignment_use() {
-        let test = cursor_test(
-            r#"
-        class Foo:
-            def __init__(self, a: int):
-                self.a: int = a
-                """This is the docs for this value
-
-                Wow these are good docs!
-                """
-
-        x = Foo(1)
-        x.a<CURSOR>
-        "#,
-        );
-
-        assert_snapshot!(test.hover(), @r"
-        int
-        ---------------------------------------------
-        This is the docs for this value
-
-        Wow these are good docs!
-
-        ---------------------------------------------
-        ```python
-        int
-        ```
-        ---
-        This is the docs for this value  
-          
-        Wow these are good docs!
-        ---------------------------------------------
-        info[hover]: Hovered content is
-          --> main.py:11:3
-           |
-        10 | x = Foo(1)
-        11 | x.a
-           |   ^- Cursor offset
-           |   |
-           |   source
-           |
         ");
     }
 
@@ -3450,12 +3228,12 @@ def function():
         // TODO: We should only show the matching overload here.
         // https://github.com/astral-sh/ty/issues/73
         assert_snapshot!(test.hover(), @r"
-        def __add__(other: Test, /) -> Test
-        def __add__(other: Other, /) -> Test
+        (other: Test, /) -> Test
+        (other: Other, /) -> Test
         ---------------------------------------------
         ```python
-        def __add__(other: Test, /) -> Test
-        def __add__(other: Other, /) -> Test
+        (other: Test, /) -> Test
+        (other: Other, /) -> Test
         ```
         ---------------------------------------------
         info[hover]: Hovered content is
@@ -3565,7 +3343,7 @@ def function():
         assert_snapshot!(test.hover(), @r"
         <module 'mypackage.subpkg'>
         ---------------------------------------------
-        ```xml
+        ```python
         <module 'mypackage.subpkg'>
         ```
         ---------------------------------------------
@@ -3607,7 +3385,7 @@ def function():
         assert_snapshot!(test.hover(), @r"
         <module 'mypackage.subpkg'>
         ---------------------------------------------
-        ```xml
+        ```python
         <module 'mypackage.subpkg'>
         ```
         ---------------------------------------------
@@ -3691,7 +3469,7 @@ def function():
         assert_snapshot!(test.hover(), @r"
         <module 'mypackage.subpkg.submod'>
         ---------------------------------------------
-        ```xml
+        ```python
         <module 'mypackage.subpkg.submod'>
         ```
         ---------------------------------------------
@@ -3732,7 +3510,7 @@ def function():
         assert_snapshot!(test.hover(), @r"
         <module 'mypackage.subpkg'>
         ---------------------------------------------
-        ```xml
+        ```python
         <module 'mypackage.subpkg'>
         ```
         ---------------------------------------------

crates/ty_ide/src/importer.rs

@@ -745,17 +745,8 @@ impl ImportResponseKind<'_> {
     fn priority(&self) -> usize {
         match *self {
             ImportResponseKind::Unqualified { .. } => 0,
-            ImportResponseKind::Partial(_) => 1,
-            // N.B. When given the choice between adding a
-            // name to an existing `from ... import ...`
-            // statement and using an existing `import ...`
-            // in a qualified manner, we currently choose
-            // the former. Originally we preferred qualification,
-            // but there is some evidence that this violates
-            // expectations.
-            //
-            // Ref: https://github.com/astral-sh/ty/issues/1274#issuecomment-3352233790
-            ImportResponseKind::Qualified { .. } => 2,
+            ImportResponseKind::Qualified { .. } => 1,
+            ImportResponseKind::Partial(_) => 2,
         }
     }
 }
@@ -869,6 +860,7 @@ mod tests {
     use insta::assert_snapshot;
     use insta::internals::SettingsBindDropGuard;
 
+    use crate::find_node::covering_node;
     use crate::tests::{CursorTest, CursorTestBuilder, cursor_test};
     use ruff_db::diagnostic::{Diagnostic, DiagnosticFormat, DisplayDiagnosticConfig};
     use ruff_db::files::{File, FileRootKind, system_path_to_file};
@@ -876,7 +868,6 @@ mod tests {
     use ruff_db::source::source_text;
     use ruff_db::system::{DbWithWritableSystem, SystemPath, SystemPathBuf};
     use ruff_db::{Db, system};
-    use ruff_python_ast::find_node::covering_node;
     use ruff_python_codegen::Stylist;
     use ruff_python_trivia::textwrap::dedent;
     use ruff_text_size::TextSize;
@@ -1341,9 +1332,9 @@ import collections
         );
         assert_snapshot!(
             test.import("collections", "defaultdict"), @r"
-        from collections import OrderedDict, defaultdict
+        from collections import OrderedDict
         import collections
-        defaultdict
+        collections.defaultdict
         ");
     }
 

crates/ty_ide/src/inlay_hints.rs

@@ -6216,7 +6216,7 @@ mod tests {
         assert_snapshot!(test.inlay_hints(), @r#"
         from typing import Literal
 
-        a[: <special-form 'Literal["a", "b", "c"]'>] = Literal['a', 'b', 'c']
+        a[: <special form 'Literal["a", "b", "c"]'>] = Literal['a', 'b', 'c']
         ---------------------------------------------
         info[inlay-hint-location]: Inlay Hint Target
            --> stdlib/typing.pyi:351:1
@@ -6232,7 +6232,7 @@ mod tests {
           |
         2 | from typing import Literal
         3 |
-        4 | a[: <special-form 'Literal["a", "b", "c"]'>] = Literal['a', 'b', 'c']
+        4 | a[: <special form 'Literal["a", "b", "c"]'>] = Literal['a', 'b', 'c']
           |                    ^^^^^^^
           |
 
@@ -6250,7 +6250,7 @@ mod tests {
           |
         2 | from typing import Literal
         3 |
-        4 | a[: <special-form 'Literal["a", "b", "c"]'>] = Literal['a', 'b', 'c']
+        4 | a[: <special form 'Literal["a", "b", "c"]'>] = Literal['a', 'b', 'c']
           |                            ^^^
           |
 
@@ -6268,7 +6268,7 @@ mod tests {
           |
         2 | from typing import Literal
         3 |
-        4 | a[: <special-form 'Literal["a", "b", "c"]'>] = Literal['a', 'b', 'c']
+        4 | a[: <special form 'Literal["a", "b", "c"]'>] = Literal['a', 'b', 'c']
           |                                 ^^^
           |
 
@@ -6286,7 +6286,7 @@ mod tests {
           |
         2 | from typing import Literal
         3 |
-        4 | a[: <special-form 'Literal["a", "b", "c"]'>] = Literal['a', 'b', 'c']
+        4 | a[: <special form 'Literal["a", "b", "c"]'>] = Literal['a', 'b', 'c']
           |                                      ^^^
           |
         "#);
@@ -6636,7 +6636,7 @@ mod tests {
         assert_snapshot!(test.inlay_hints(), @r"
         from typing import Protocol, TypeVar
         T = TypeVar([name=]'T')
-        Strange[: <special-form 'typing.Protocol[T]'>] = Protocol[T]
+        Strange[: <special form 'typing.Protocol[T]'>] = Protocol[T]
         ---------------------------------------------
         info[inlay-hint-location]: Inlay Hint Target
            --> stdlib/typing.pyi:276:13
@@ -6654,7 +6654,7 @@ mod tests {
         2 | from typing import Protocol, TypeVar
         3 | T = TypeVar([name=]'T')
           |              ^^^^
-        4 | Strange[: <special-form 'typing.Protocol[T]'>] = Protocol[T]
+        4 | Strange[: <special form 'typing.Protocol[T]'>] = Protocol[T]
           |
 
         info[inlay-hint-location]: Inlay Hint Target
@@ -6671,7 +6671,7 @@ mod tests {
           |
         2 | from typing import Protocol, TypeVar
         3 | T = TypeVar([name=]'T')
-        4 | Strange[: <special-form 'typing.Protocol[T]'>] = Protocol[T]
+        4 | Strange[: <special form 'typing.Protocol[T]'>] = Protocol[T]
           |                          ^^^^^^^^^^^^^^^
           |
 
@@ -6688,7 +6688,7 @@ mod tests {
           |
         2 | from typing import Protocol, TypeVar
         3 | T = TypeVar([name=]'T')
-        4 | Strange[: <special-form 'typing.Protocol[T]'>] = Protocol[T]
+        4 | Strange[: <special form 'typing.Protocol[T]'>] = Protocol[T]
           |                                          ^
           |
         ");

crates/ty_ide/src/lib.rs

@@ -8,6 +8,7 @@ mod completion;
 mod doc_highlights;
 mod docstring;
 mod document_symbols;
+mod find_node;
 mod find_references;
 mod goto;
 mod goto_declaration;

crates/ty_ide/src/references.rs

@@ -10,10 +10,10 @@
 //! all references to these externally-visible symbols therefore requires
 //! an expensive search of all source files in the workspace.
 
+use crate::find_node::CoveringNode;
 use crate::goto::GotoTarget;
 use crate::{Db, NavigationTargets, ReferenceKind, ReferenceTarget};
 use ruff_db::files::File;
-use ruff_python_ast::find_node::CoveringNode;
 use ruff_python_ast::token::Tokens;
 use ruff_python_ast::{
     self as ast, AnyNodeRef,
@@ -334,7 +334,10 @@ impl LocalReferencesFinder<'_> {
 
     /// Determines whether the given covering node is a reference to
     /// the symbol we are searching for
-    fn check_reference_from_covering_node(&mut self, covering_node: &CoveringNode<'_>) {
+    fn check_reference_from_covering_node(
+        &mut self,
+        covering_node: &crate::find_node::CoveringNode<'_>,
+    ) {
         // Use the start of the covering node as the offset. Any offset within
         // the node is fine here. Offsets matter only for import statements
         // where the identifier might be a multi-part module name.

crates/ty_ide/src/selection_range.rs

@@ -1,9 +1,9 @@
 use ruff_db::files::File;
 use ruff_db::parsed::parsed_module;
-use ruff_python_ast::find_node::covering_node;
 use ruff_text_size::{Ranged, TextRange, TextSize};
 
 use crate::Db;
+use crate::find_node::covering_node;
 
 /// Returns a list of nested selection ranges, where each range contains the next one.
 /// The first range in the list is the largest range containing the cursor position.
@@ -66,28 +66,20 @@ x = 1 + <CURSOR>2
 
         assert_snapshot!(test.selection_range(), @r"
         info[selection-range]: Selection Range 0
-         --> main.py:1:1
-          |
-        1 | /
-        2 | | x = 1 + 2
-          | |__________^
-          |
-
-        info[selection-range]: Selection Range 1
          --> main.py:2:1
           |
         2 | x = 1 + 2
           | ^^^^^^^^^
           |
 
-        info[selection-range]: Selection Range 2
+        info[selection-range]: Selection Range 1
          --> main.py:2:5
           |
         2 | x = 1 + 2
           |     ^^^^^
           |
 
-        info[selection-range]: Selection Range 3
+        info[selection-range]: Selection Range 2
          --> main.py:2:9
           |
         2 | x = 1 + 2
@@ -110,28 +102,20 @@ print(\"he<CURSOR>llo\")
 
         assert_snapshot!(test.selection_range(), @r#"
         info[selection-range]: Selection Range 0
-         --> main.py:1:1
-          |
-        1 | /
-        2 | | print("hello")
-          | |_______________^
-          |
-
-        info[selection-range]: Selection Range 1
          --> main.py:2:1
           |
         2 | print("hello")
           | ^^^^^^^^^^^^^^
           |
 
-        info[selection-range]: Selection Range 2
+        info[selection-range]: Selection Range 1
          --> main.py:2:6
           |
         2 | print("hello")
           |      ^^^^^^^^^
           |
 
-        info[selection-range]: Selection Range 3
+        info[selection-range]: Selection Range 2
          --> main.py:2:7
           |
         2 | print("hello")
@@ -155,15 +139,6 @@ def my_<CURSOR>function():
 
         assert_snapshot!(test.selection_range(), @r"
         info[selection-range]: Selection Range 0
-         --> main.py:1:1
-          |
-        1 | /
-        2 | | def my_function():
-        3 | |     return 42
-          | |______________^
-          |
-
-        info[selection-range]: Selection Range 1
          --> main.py:2:1
           |
         2 | / def my_function():
@@ -171,7 +146,7 @@ def my_<CURSOR>function():
           | |_____________^
           |
 
-        info[selection-range]: Selection Range 2
+        info[selection-range]: Selection Range 1
          --> main.py:2:5
           |
         2 | def my_function():
@@ -197,16 +172,6 @@ class My<CURSOR>Class:
 
         assert_snapshot!(test.selection_range(), @r"
         info[selection-range]: Selection Range 0
-         --> main.py:1:1
-          |
-        1 | /
-        2 | | class MyClass:
-        3 | |     def __init__(self):
-        4 | |         self.value = 1
-          | |_______________________^
-          |
-
-        info[selection-range]: Selection Range 1
          --> main.py:2:1
           |
         2 | / class MyClass:
@@ -215,7 +180,7 @@ class My<CURSOR>Class:
           | |______________________^
           |
 
-        info[selection-range]: Selection Range 2
+        info[selection-range]: Selection Range 1
          --> main.py:2:7
           |
         2 | class MyClass:
@@ -240,56 +205,48 @@ result = [(lambda x: x[key.<CURSOR>attr])(item) for item in data if item is not
 
         assert_snapshot!(test.selection_range(), @r"
         info[selection-range]: Selection Range 0
-         --> main.py:1:1
-          |
-        1 | /
-        2 | | result = [(lambda x: x[key.attr])(item) for item in data if item is not None]
-          | |______________________________________________________________________________^
-          |
-
-        info[selection-range]: Selection Range 1
          --> main.py:2:1
           |
         2 | result = [(lambda x: x[key.attr])(item) for item in data if item is not None]
           | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
           |
 
-        info[selection-range]: Selection Range 2
+        info[selection-range]: Selection Range 1
          --> main.py:2:10
           |
         2 | result = [(lambda x: x[key.attr])(item) for item in data if item is not None]
           |          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
           |
 
-        info[selection-range]: Selection Range 3
+        info[selection-range]: Selection Range 2
          --> main.py:2:11
           |
         2 | result = [(lambda x: x[key.attr])(item) for item in data if item is not None]
           |           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
           |
 
-        info[selection-range]: Selection Range 4
+        info[selection-range]: Selection Range 3
          --> main.py:2:12
           |
         2 | result = [(lambda x: x[key.attr])(item) for item in data if item is not None]
           |            ^^^^^^^^^^^^^^^^^^^^^
           |
 
-        info[selection-range]: Selection Range 5
+        info[selection-range]: Selection Range 4
          --> main.py:2:22
           |
         2 | result = [(lambda x: x[key.attr])(item) for item in data if item is not None]
           |                      ^^^^^^^^^^^
           |
 
-        info[selection-range]: Selection Range 6
+        info[selection-range]: Selection Range 5
          --> main.py:2:24
           |
         2 | result = [(lambda x: x[key.attr])(item) for item in data if item is not None]
           |                        ^^^^^^^^
           |
 
-        info[selection-range]: Selection Range 7
+        info[selection-range]: Selection Range 6
          --> main.py:2:28
           |
         2 | result = [(lambda x: x[key.attr])(item) for item in data if item is not None]

crates/ty_ide/src/semantic_tokens.rs

@@ -254,9 +254,7 @@ impl<'db> SemanticTokenVisitor<'db> {
     }
 
     fn is_constant_name(name: &str) -> bool {
-        name.chars()
-            .all(|c| c.is_uppercase() || c == '_' || c.is_numeric())
-            && name.len() > 1
+        name.chars().all(|c| c.is_uppercase() || c == '_') && name.len() > 1
     }
 
     fn classify_name(&self, name: &ast::ExprName) -> (SemanticTokenType, SemanticTokenModifier) {
@@ -2232,49 +2230,6 @@ class MyClass:
         "###);
     }
 
-    #[test]
-    fn test_constant_variations() {
-        let test = SemanticTokenTest::new(
-            r#"
-A = 1
-AB = 1
-ABC = 1
-A1 = 1
-AB1 = 1
-ABC1 = 1
-A_B = 1
-A1_B = 1
-A_B1 = 1
-A_1 = 1
-"#,
-        );
-
-        let tokens = test.highlight_file();
-
-        assert_snapshot!(test.to_snapshot(&tokens), @r#"
-        "A" @ 1..2: Variable [definition]
-        "1" @ 5..6: Number
-        "AB" @ 7..9: Variable [definition, readonly]
-        "1" @ 12..13: Number
-        "ABC" @ 14..17: Variable [definition, readonly]
-        "1" @ 20..21: Number
-        "A1" @ 22..24: Variable [definition, readonly]
-        "1" @ 27..28: Number
-        "AB1" @ 29..32: Variable [definition, readonly]
-        "1" @ 35..36: Number
-        "ABC1" @ 37..41: Variable [definition, readonly]
-        "1" @ 44..45: Number
-        "A_B" @ 46..49: Variable [definition, readonly]
-        "1" @ 52..53: Number
-        "A1_B" @ 54..58: Variable [definition, readonly]
-        "1" @ 61..62: Number
-        "A_B1" @ 63..67: Variable [definition, readonly]
-        "1" @ 70..71: Number
-        "A_1" @ 72..75: Variable [definition, readonly]
-        "1" @ 78..79: Number
-        "#);
-    }
-
     #[test]
     fn test_implicitly_concatenated_strings() {
         let test = SemanticTokenTest::new(

crates/ty_ide/src/signature_help.rs

@@ -6,12 +6,11 @@
 //! types, and documentation. It supports multiple signatures for union types
 //! and overloads.
 
-use crate::Db;
 use crate::docstring::Docstring;
 use crate::goto::Definitions;
+use crate::{Db, find_node::covering_node};
 use ruff_db::files::File;
 use ruff_db::parsed::parsed_module;
-use ruff_python_ast::find_node::covering_node;
 use ruff_python_ast::token::TokenKind;
 use ruff_python_ast::{self as ast, AnyNodeRef};
 use ruff_text_size::{Ranged, TextRange, TextSize};
@@ -125,11 +124,6 @@ fn get_call_expr(
         })?;
 
     // Find the covering node at the given position that is a function call.
-    // Note that we are okay with the range being anywhere within a call
-    // expression, even if it's not in the arguments portion of the call
-    // expression. This is because, e.g., a user can request signature
-    // information at a call site, and this should ideally work anywhere
-    // within the call site, even at the function name.
     let call = covering_node(root_node, token.range())
         .find_first(|node| {
             if !node.is_expr_call() {

crates/ty_project/src/metadata.rs

@@ -5,7 +5,7 @@ use ruff_python_ast::name::Name;
 use std::sync::Arc;
 use thiserror::Error;
 use ty_combine::Combine;
-use ty_python_semantic::{MisconfigurationMode, ProgramSettings};
+use ty_python_semantic::ProgramSettings;
 
 use crate::metadata::options::ProjectOptionsOverrides;
 use crate::metadata::pyproject::{Project, PyProject, PyProjectError, ResolveRequiresPythonError};
@@ -37,9 +37,6 @@ pub struct ProjectMetadata {
     /// The path ordering doesn't imply precedence.
     #[cfg_attr(test, serde(skip_serializing_if = "Vec::is_empty"))]
     pub(super) extra_configuration_paths: Vec<SystemPathBuf>,
-
-    #[cfg_attr(test, serde(skip))]
-    pub(super) misconfiguration_mode: MisconfigurationMode,
 }
 
 impl ProjectMetadata {
@@ -50,7 +47,6 @@ impl ProjectMetadata {
             root,
             extra_configuration_paths: Vec::default(),
             options: Options::default(),
-            misconfiguration_mode: MisconfigurationMode::Fail,
         }
     }
 
@@ -74,7 +70,6 @@ impl ProjectMetadata {
             root: system.current_directory().to_path_buf(),
             options,
             extra_configuration_paths: vec![path],
-            misconfiguration_mode: MisconfigurationMode::Fail,
         })
     }
 
@@ -87,7 +82,6 @@ impl ProjectMetadata {
             pyproject.tool.and_then(|tool| tool.ty).unwrap_or_default(),
             root,
             pyproject.project.as_ref(),
-            MisconfigurationMode::Fail,
         )
     }
 
@@ -96,7 +90,6 @@ impl ProjectMetadata {
         mut options: Options,
         root: SystemPathBuf,
         project: Option<&Project>,
-        misconfiguration_mode: MisconfigurationMode,
     ) -> Result<Self, ResolveRequiresPythonError> {
         let name = project
             .and_then(|project| project.name.as_deref())
@@ -124,7 +117,6 @@ impl ProjectMetadata {
             root,
             options,
             extra_configuration_paths: Vec::new(),
-            misconfiguration_mode,
         })
     }
 
@@ -202,7 +194,6 @@ impl ProjectMetadata {
                     pyproject
                         .as_ref()
                         .and_then(|pyproject| pyproject.project.as_ref()),
-                    MisconfigurationMode::Fail,
                 )
                 .map_err(|err| {
                     ProjectMetadataError::InvalidRequiresPythonConstraint {
@@ -282,13 +273,8 @@ impl ProjectMetadata {
         system: &dyn System,
         vendored: &VendoredFileSystem,
     ) -> anyhow::Result<ProgramSettings> {
-        self.options.to_program_settings(
-            self.root(),
-            self.name(),
-            system,
-            vendored,
-            self.misconfiguration_mode,
-        )
+        self.options
+            .to_program_settings(self.root(), self.name(), system, vendored)
     }
 
     pub fn apply_overrides(&mut self, overrides: &ProjectOptionsOverrides) {

crates/ty_project/src/metadata/options.rs

@@ -30,9 +30,9 @@ use thiserror::Error;
 use ty_combine::Combine;
 use ty_python_semantic::lint::{Level, LintSource, RuleSelection};
 use ty_python_semantic::{
-    MisconfigurationMode, ProgramSettings, PythonEnvironment, PythonPlatform,
-    PythonVersionFileSource, PythonVersionSource, PythonVersionWithSource, SearchPathSettings,
-    SearchPathValidationError, SearchPaths, SitePackagesPaths, SysPrefixPathOrigin,
+    ProgramSettings, PythonEnvironment, PythonPlatform, PythonVersionFileSource,
+    PythonVersionSource, PythonVersionWithSource, SearchPathSettings, SearchPathValidationError,
+    SearchPaths, SitePackagesPaths, SysPrefixPathOrigin,
 };
 use ty_static::EnvVars;
 
@@ -117,7 +117,6 @@ impl Options {
         project_name: &str,
         system: &dyn System,
         vendored: &VendoredFileSystem,
-        misconfiguration_mode: MisconfigurationMode,
     ) -> anyhow::Result<ProgramSettings> {
         let environment = self.environment.or_default();
 
@@ -155,25 +154,14 @@ impl Options {
                 ValueSource::Editor => SysPrefixPathOrigin::Editor,
             };
 
-            PythonEnvironment::new(python_path.absolute(project_root, system), origin, system)
-                .map_err(anyhow::Error::from)
-                .map(Some)
+            Some(PythonEnvironment::new(
+                python_path.absolute(project_root, system),
+                origin,
+                system,
+            )?)
         } else {
             PythonEnvironment::discover(project_root, system)
-                .context("Failed to discover local Python environment")
-        };
-
-        // If in safe-mode, fallback to None if this fails instead of erroring.
-        let python_environment = match python_environment {
-            Ok(python_environment) => python_environment,
-            Err(err) => {
-                if misconfiguration_mode == MisconfigurationMode::UseDefault {
-                    tracing::debug!("Default settings failed to discover local Python environment");
-                    None
-                } else {
-                    return Err(err);
-                }
-            }
+                .context("Failed to discover local Python environment")?
         };
 
         let self_site_packages = self_environment_search_paths(
@@ -186,23 +174,11 @@ impl Options {
         .unwrap_or_default();
 
         let site_packages_paths = if let Some(python_environment) = python_environment.as_ref() {
-            let site_packages_paths = python_environment
-                .site_packages_paths(system)
-                .context("Failed to discover the site-packages directory");
-            let site_packages_paths = match site_packages_paths {
-                Ok(paths) => paths,
-                Err(err) => {
-                    if misconfiguration_mode == MisconfigurationMode::UseDefault {
-                        tracing::debug!(
-                            "Default settings failed to discover site-packages directory"
-                        );
-                        SitePackagesPaths::default()
-                    } else {
-                        return Err(err);
-                    }
-                }
-            };
-            self_site_packages.concatenate(site_packages_paths)
+            self_site_packages.concatenate(
+                python_environment
+                    .site_packages_paths(system)
+                    .context("Failed to discover the site-packages directory")?,
+            )
         } else {
             tracing::debug!("No virtual environment found");
             self_site_packages
@@ -225,7 +201,6 @@ impl Options {
             .or_else(|| site_packages_paths.python_version_from_layout())
             .unwrap_or_default();
 
-        // Safe mode is handled inside this function, so we just assume this can't fail
         let search_paths = self.to_search_paths(
             project_root,
             project_name,
@@ -233,7 +208,6 @@ impl Options {
             real_stdlib_path,
             system,
             vendored,
-            misconfiguration_mode,
         )?;
 
         tracing::info!(
@@ -248,7 +222,6 @@ impl Options {
         })
     }
 
-    #[expect(clippy::too_many_arguments)]
     fn to_search_paths(
         &self,
         project_root: &SystemPath,
@@ -257,7 +230,6 @@ impl Options {
         real_stdlib_path: Option<SystemPathBuf>,
         system: &dyn System,
         vendored: &VendoredFileSystem,
-        misconfiguration_mode: MisconfigurationMode,
     ) -> Result<SearchPaths, SearchPathValidationError> {
         let environment = self.environment.or_default();
         let src = self.src.or_default();
@@ -372,7 +344,6 @@ impl Options {
                 .map(|path| path.absolute(project_root, system)),
             site_packages_paths: site_packages_paths.into_vec(),
             real_stdlib_path,
-            misconfiguration_mode,
         };
 
         settings.to_search_paths(system, vendored)
@@ -1254,22 +1225,24 @@ pub struct TerminalOptions {
 ///
 /// An override allows you to apply different rule configurations to specific
 /// files or directories. Multiple overrides can match the same file, with
-/// later overrides take precedence. Override rules take precedence over global
-/// rules for matching files.
+/// later overrides take precedence.
 ///
-/// For example, to relax enforcement of rules in test files:
+/// ### Precedence
+///
+/// - Later overrides in the array take precedence over earlier ones
+/// - Override rules take precedence over global rules for matching files
+///
+/// ### Examples
 ///
 /// ```toml
+/// # Relax rules for test files
 /// [[tool.ty.overrides]]
 /// include = ["tests/**", "**/test_*.py"]
 ///
 /// [tool.ty.overrides.rules]
 /// possibly-unresolved-reference = "warn"
-/// ```
 ///
-/// Or, to ignore a rule in generated files but retain enforcement in an important file:
-///
-/// ```toml
+/// # Ignore generated files but still check important ones
 /// [[tool.ty.overrides]]
 /// include = ["generated/**"]
 /// exclude = ["generated/important.py"]

crates/ty_python_semantic/Cargo.toml

@@ -33,7 +33,7 @@ camino = { workspace = true }
 colored = { workspace = true }
 compact_str = { workspace = true }
 drop_bomb = { workspace = true }
-get-size2 = { workspace = true, features = ["indexmap", "ordermap"] }
+get-size2 = { workspace = true, features = ["indexmap", "ordermap"]}
 indexmap = { workspace = true }
 itertools = { workspace = true }
 ordermap = { workspace = true }
@@ -62,7 +62,7 @@ ty_test = { workspace = true }
 ty_vendored = { workspace = true }
 
 anyhow = { workspace = true }
-datatest-stable = { workspace = true }
+dir-test = { workspace = true }
 glob = { workspace = true }
 indoc = { workspace = true }
 insta = { workspace = true }
@@ -76,9 +76,5 @@ schemars = ["dep:schemars", "dep:serde_json"]
 serde = ["ruff_db/serde", "dep:serde", "ruff_python_ast/serde"]
 testing = []
 
-[[test]]
-name = "mdtest"
-harness = false
-
 [lints]
 workspace = true

crates/ty_python_semantic/build.rs

@@ -0,0 +1,4 @@
+/// Rebuild the crate if a test file is added or removed from
+pub fn main() {
+    println!("cargo::rerun-if-changed=resources/mdtest");
+}

crates/ty_python_semantic/mdtest.py

@@ -129,8 +129,17 @@ class MDTestRunner:
             check=False,
         )
 
+    def _mangle_path(self, markdown_file: Path) -> str:
+        return (
+            markdown_file.as_posix()
+            .replace("/", "_")
+            .replace("-", "_")
+            .removesuffix(".md")
+        )
+
     def _run_mdtests_for_file(self, markdown_file: Path) -> None:
-        test_name = f"mdtest::{markdown_file}"
+        path_mangled = self._mangle_path(markdown_file)
+        test_name = f"mdtest__{path_mangled}"
 
         output = self._run_mdtest(["--exact", test_name], capture_output=True)
 
@@ -236,10 +245,16 @@ class MDTestRunner:
             if rust_code_has_changed:
                 if self._recompile_tests("Rust code has changed, recompiling tests..."):
                     self._run_mdtest(self.filters)
-            elif vendored_typeshed_has_changed and self._recompile_tests(
-                "Vendored typeshed has changed, recompiling tests..."
-            ):
-                self._run_mdtest(self.filters)
+            elif vendored_typeshed_has_changed:
+                if self._recompile_tests(
+                    "Vendored typeshed has changed, recompiling tests..."
+                ):
+                    self._run_mdtest(self.filters)
+            elif new_md_files:
+                files = " ".join(file.as_posix() for file in new_md_files)
+                self._recompile_tests(
+                    f"New Markdown test [yellow]{files}[/yellow] detected, recompiling tests..."
+                )
 
             for path in new_md_files | changed_md_files:
                 self._run_mdtests_for_file(path)

crates/ty_python_semantic/resources/mdtest/annotations/any.md

@@ -169,13 +169,13 @@ def f(x: Any[int]):
 `Any` cannot be called (this leads to a `TypeError` at runtime):
 
 ```py
-Any()  # error: [call-non-callable] "Object of type `<special-form 'typing.Any'>` is not callable"
+Any()  # error: [call-non-callable] "Object of type `<special form 'typing.Any'>` is not callable"
 ```
 
 `Any` also cannot be used as a metaclass (under the hood, this leads to an implicit call to `Any`):
 
 ```py
-class F(metaclass=Any): ...  # error: [invalid-metaclass] "Metaclass type `<special-form 'typing.Any'>` is not callable"
+class F(metaclass=Any): ...  # error: [invalid-metaclass] "Metaclass type `<special form 'typing.Any'>` is not callable"
 ```
 
 And `Any` cannot be used in `isinstance()` checks:

crates/ty_python_semantic/resources/mdtest/annotations/callable.md

@@ -407,22 +407,4 @@ def f_okay(c: Callable[[], None]):
             c.__qualname__ = "my_callable"  # okay
 ```
 
-## From a class
-
-### Subclasses should return themselves, not superclass
-
-```py
-from ty_extensions import into_callable
-
-class Base:
-    def __init__(self) -> None:
-        pass
-
-class A(Base):
-    pass
-
-# revealed: () -> A
-reveal_type(into_callable(A))
-```
-
 [gradual form]: https://typing.python.org/en/latest/spec/glossary.html#term-gradual-form

crates/ty_python_semantic/resources/mdtest/annotations/deferred.md

@@ -205,93 +205,3 @@ class B:
 class A(B): ...
 class B: ...
 ```
-
-## Default argument values
-
-### Not deferred in regular files
-
-```py
-# error: [unresolved-reference]
-def f(mode: int = ParseMode.test):
-    pass
-
-class ParseMode:
-    test = 1
-```
-
-### Deferred in stub files
-
-Forward references in default argument values are allowed in stub files.
-
-```pyi
-def f(mode: int = ParseMode.test): ...
-
-class ParseMode:
-    test: int
-```
-
-### Undefined names are still errors in stub files
-
-```pyi
-# error: [unresolved-reference]
-def f(mode: int = NeverDefined.test): ...
-```
-
-## Class keyword arguments
-
-### Not deferred in regular files
-
-```py
-# error: [unresolved-reference]
-class Foo(metaclass=SomeMeta):
-    pass
-
-class SomeMeta(type):
-    pass
-```
-
-### Deferred in stub files
-
-Forward references in class keyword arguments are allowed in stub files.
-
-```pyi
-class Foo(metaclass=SomeMeta): ...
-
-class SomeMeta(type): ...
-```
-
-### Undefined names are still errors in stub files
-
-```pyi
-# error: [unresolved-reference]
-class Foo(metaclass=NeverDefined): ...
-```
-
-## Lambda default argument values
-
-### Not deferred in regular files
-
-```py
-# error: [unresolved-reference]
-f = lambda x=Foo(): x
-
-class Foo:
-    pass
-```
-
-### Deferred in stub files
-
-Forward references in lambda default argument values are allowed in stub files.
-
-```pyi
-f = lambda x=Foo(): x
-
-class Foo: ...
-```
-
-### Undefined names are still errors in stub files
-
-```pyi
-# error: [unresolved-reference]
-f = lambda x=NeverDefined(): x
-```

crates/ty_python_semantic/resources/mdtest/annotations/never.md

@@ -59,7 +59,7 @@ python-version = "3.11"
 ```py
 from typing import Never
 
-reveal_type(Never)  # revealed: <special-form 'typing.Never'>
+reveal_type(Never)  # revealed: <special form 'typing.Never'>
 ```
 
 ### Python 3.10

crates/ty_python_semantic/resources/mdtest/annotations/self.md

@@ -194,7 +194,7 @@ reveal_type(B().name_does_not_matter())  # revealed: B
 reveal_type(B().positional_only(1))  # revealed: B
 reveal_type(B().keyword_only(x=1))  # revealed: B
 # TODO: This should deally be `B`
-reveal_type(B().decorated_method())  # revealed: Self@decorated_method
+reveal_type(B().decorated_method())  # revealed: Unknown
 
 reveal_type(B().a_property)  # revealed: B
 

crates/ty_python_semantic/resources/mdtest/async.md

@@ -43,7 +43,9 @@ async def main():
     loop = asyncio.get_event_loop()
     with concurrent.futures.ThreadPoolExecutor() as pool:
         result = await loop.run_in_executor(pool, blocking_function)
-        reveal_type(result)  # revealed: int
+
+        # TODO: should be `int`
+        reveal_type(result)  # revealed: Unknown
 ```
 
 ### `asyncio.Task`

crates/ty_python_semantic/resources/mdtest/attributes.md

@@ -1208,7 +1208,7 @@ def _(flag: bool):
     reveal_type(C1.y)  # revealed: int | str
 
     C1.y = 100
-    # error: [invalid-assignment] "Object of type `Literal["problematic"]` is not assignable to attribute `y` on type `<class 'mdtest_snippet.<locals of function '_'>.C1 @ src/mdtest_snippet.py:3'> | <class 'mdtest_snippet.<locals of function '_'>.C1 @ src/mdtest_snippet.py:8'>`"
+    # error: [invalid-assignment] "Object of type `Literal["problematic"]` is not assignable to attribute `y` on type `<class 'C1'> | <class 'C1'>`"
     C1.y = "problematic"
 
     class C2:

crates/ty_python_semantic/resources/mdtest/binary/classes.md

@@ -13,7 +13,7 @@ python-version = "3.10"
 class A: ...
 class B: ...
 
-reveal_type(A | B)  # revealed: <types.UnionType special-form 'A | B'>
+reveal_type(A | B)  # revealed: <types.UnionType special form 'A | B'>
 ```
 
 ## Union of two classes (prior to 3.10)
@@ -43,14 +43,14 @@ class A: ...
 class B: ...
 
 def _(sub_a: type[A], sub_b: type[B]):
-    reveal_type(A | sub_b)  # revealed: <types.UnionType special-form>
-    reveal_type(sub_a | B)  # revealed: <types.UnionType special-form>
-    reveal_type(sub_a | sub_b)  # revealed: <types.UnionType special-form>
+    reveal_type(A | sub_b)  # revealed: <types.UnionType special form>
+    reveal_type(sub_a | B)  # revealed: <types.UnionType special form>
+    reveal_type(sub_a | sub_b)  # revealed: <types.UnionType special form>
 
 class C[T]: ...
 class D[T]: ...
 
-reveal_type(C | D)  # revealed: <types.UnionType special-form 'C[Unknown] | D[Unknown]'>
+reveal_type(C | D)  # revealed: <types.UnionType special form 'C[Unknown] | D[Unknown]'>
 
-reveal_type(C[int] | D[str])  # revealed: <types.UnionType special-form 'C[int] | D[str]'>
+reveal_type(C[int] | D[str])  # revealed: <types.UnionType special form 'C[int] | D[str]'>
 ```

crates/ty_python_semantic/resources/mdtest/call/builtins.md

@@ -114,7 +114,6 @@ but fall back to `bool` otherwise.
 ```py
 from enum import Enum
 from types import FunctionType
-from typing import TypeVar
 
 class Answer(Enum):
     NO = 0
@@ -138,7 +137,6 @@ reveal_type(isinstance("", int))  # revealed: bool
 
 class A: ...
 class SubclassOfA(A): ...
-class OtherSubclassOfA(A): ...
 class B: ...
 
 reveal_type(isinstance(A, type))  # revealed: Literal[True]
@@ -163,29 +161,6 @@ def _(x: A | B, y: list[int]):
     else:
         reveal_type(x)  # revealed: B & ~A
         reveal_type(isinstance(x, B))  # revealed: Literal[True]
-
-T = TypeVar("T")
-T_bound_A = TypeVar("T_bound_A", bound=A)
-T_constrained = TypeVar("T_constrained", SubclassOfA, OtherSubclassOfA)
-
-def _(
-    x: T,
-    x_bound_a: T_bound_A,
-    x_constrained_sub_a: T_constrained,
-):
-    reveal_type(isinstance(x, object))  # revealed: Literal[True]
-    reveal_type(isinstance(x, A))  # revealed: bool
-
-    reveal_type(isinstance(x_bound_a, object))  # revealed: Literal[True]
-    reveal_type(isinstance(x_bound_a, A))  # revealed: Literal[True]
-    reveal_type(isinstance(x_bound_a, SubclassOfA))  # revealed: bool
-    reveal_type(isinstance(x_bound_a, B))  # revealed: bool
-
-    reveal_type(isinstance(x_constrained_sub_a, object))  # revealed: Literal[True]
-    reveal_type(isinstance(x_constrained_sub_a, A))  # revealed: Literal[True]
-    reveal_type(isinstance(x_constrained_sub_a, SubclassOfA))  # revealed: bool
-    reveal_type(isinstance(x_constrained_sub_a, OtherSubclassOfA))  # revealed: bool
-    reveal_type(isinstance(x_constrained_sub_a, B))  # revealed: bool
 ```
 
 Certain special forms in the typing module are not instances of `type`, so are strictly-speaking

crates/ty_python_semantic/resources/mdtest/call/callables_as_descriptors.md

@@ -113,7 +113,9 @@ intention that it shouldn't influence the method's descriptor behavior. For exam
 ```py
 from typing import Callable
 
-def memoize[**P, R](f: Callable[P, R]) -> Callable[P, R]:
+# TODO: this could use a generic signature, but we don't support
+# `ParamSpec` and solving of typevars inside `Callable` types yet.
+def memoize(f: Callable[[C1, int], str]) -> Callable[[C1, int], str]:
     raise NotImplementedError
 
 class C1:
@@ -257,37 +259,4 @@ reveal_type(MyClass().method)  # revealed: (...) -> int
 reveal_type(MyClass().method.__name__)  # revealed: str
 ```
 
-## classmethods passed through Callable-returning decorators
-
-The behavior described above is also applied to classmethods. If a method is decorated with
-`@classmethod`, and also with another decorator which returns a Callable type, we make the
-assumption that the decorator returns a callable which still has the classmethod descriptor
-behavior.
-
-```py
-from typing import Callable
-
-def callable_identity[**P, R](func: Callable[P, R]) -> Callable[P, R]:
-    return func
-
-class C:
-    @callable_identity
-    @classmethod
-    def f1(cls, x: int) -> str:
-        return "a"
-
-    @classmethod
-    @callable_identity
-    def f2(cls, x: int) -> str:
-        return "a"
-
-# error: [too-many-positional-arguments]
-# error: [invalid-argument-type]
-C.f1(C, 1)
-C.f1(1)
-C().f1(1)
-C.f2(1)
-C().f2(1)
-```
-
 [`tensorbase`]: https://github.com/pytorch/pytorch/blob/f3913ea641d871f04fa2b6588a77f63efeeb9f10/torch/_tensor.py#L1084-L1092

crates/ty_python_semantic/resources/mdtest/call/getattr_static.md

@@ -57,7 +57,7 @@ We can access attributes on objects of all kinds:
 import sys
 
 reveal_type(inspect.getattr_static(sys, "dont_write_bytecode"))  # revealed: bool
-# revealed: def getattr_static(obj: object, attr: str, default: Any | None = ...) -> Any
+# revealed: def getattr_static(obj: object, attr: str, default: Any | None = EllipsisType) -> Any
 reveal_type(inspect.getattr_static(inspect, "getattr_static"))
 
 reveal_type(inspect.getattr_static(1, "real"))  # revealed: property
@@ -144,7 +144,7 @@ from typing import Any
 def _(a: Any, tuple_of_any: tuple[Any]):
     reveal_type(inspect.getattr_static(a, "x", "default"))  # revealed: Any | Literal["default"]
 
-    # revealed: def index(self, value: Any, start: SupportsIndex = 0, stop: SupportsIndex = ..., /) -> int
+    # revealed: def index(self, value: Any, start: SupportsIndex = Literal[0], stop: SupportsIndex = int, /) -> int
     reveal_type(inspect.getattr_static(tuple_of_any, "index", "default"))
 ```
 

crates/ty_python_semantic/resources/mdtest/call/methods.md

@@ -444,18 +444,20 @@ When a `@classmethod` is additionally decorated with another decorator, it is st
 class method:
 
 ```py
+from __future__ import annotations
+
 def does_nothing[T](f: T) -> T:
     return f
 
 class C:
     @classmethod
     @does_nothing
-    def f1(cls, x: int) -> str:
+    def f1(cls: type[C], x: int) -> str:
         return "a"
 
     @does_nothing
     @classmethod
-    def f2(cls, x: int) -> str:
+    def f2(cls: type[C], x: int) -> str:
         return "a"
 
 reveal_type(C.f1(1))  # revealed: str
@@ -598,9 +600,9 @@ from typing_extensions import Self
 
 reveal_type(object.__new__)  # revealed: def __new__(cls) -> Self@__new__
 reveal_type(object().__new__)  # revealed: def __new__(cls) -> Self@__new__
-# revealed: Overload[(cls, x: str | Buffer | SupportsInt | SupportsIndex | SupportsTrunc = 0, /) -> Self@__new__, (cls, x: str | bytes | bytearray, /, base: SupportsIndex) -> Self@__new__]
+# revealed: Overload[(cls, x: str | Buffer | SupportsInt | SupportsIndex | SupportsTrunc = Literal[0], /) -> Self@__new__, (cls, x: str | bytes | bytearray, /, base: SupportsIndex) -> Self@__new__]
 reveal_type(int.__new__)
-# revealed: Overload[(cls, x: str | Buffer | SupportsInt | SupportsIndex | SupportsTrunc = 0, /) -> Self@__new__, (cls, x: str | bytes | bytearray, /, base: SupportsIndex) -> Self@__new__]
+# revealed: Overload[(cls, x: str | Buffer | SupportsInt | SupportsIndex | SupportsTrunc = Literal[0], /) -> Self@__new__, (cls, x: str | bytes | bytearray, /, base: SupportsIndex) -> Self@__new__]
 reveal_type((42).__new__)
 
 class X:

crates/ty_python_semantic/resources/mdtest/call/replace.md

@@ -36,7 +36,7 @@ class Point:
     x: int
     y: int
 
-reveal_type(Point.__replace__)  # revealed: (self: Point, *, x: int = ..., y: int = ...) -> Point
+reveal_type(Point.__replace__)  # revealed: (self: Point, *, x: int = int, y: int = int) -> Point
 ```
 
 The `__replace__` method can either be called directly or through the `replace` function:

crates/ty_python_semantic/resources/mdtest/class/super.md

@@ -602,35 +602,19 @@ super(object, object()).__class__
 # Not all objects valid in a class's bases list are valid as the first argument to `super()`.
 # For example, it's valid to inherit from `typing.ChainMap`, but it's not valid as the first argument to `super()`.
 #
-# error: [invalid-super-argument] "`<special-form 'typing.ChainMap'>` is not a valid class"
+# error: [invalid-super-argument] "`<special form 'typing.ChainMap'>` is not a valid class"
 reveal_type(super(typing.ChainMap, collections.ChainMap()))  # revealed: Unknown
 
 # Meanwhile, it's not valid to inherit from unsubscripted `typing.Generic`,
 # but it *is* valid as the first argument to `super()`.
 #
-# revealed: <super: <special-form 'typing.Generic'>, <class 'SupportsInt'>>
+# revealed: <super: <special form 'typing.Generic'>, <class 'SupportsInt'>>
 reveal_type(super(typing.Generic, typing.SupportsInt))
 
 def _(x: type[typing.Any], y: typing.Any):
     reveal_type(super(x, y))  # revealed: <super: Any, Any>
 ```
 
-### Diagnostic when the invalid type is rendered very verbosely
-
-<!-- snapshot-diagnostics -->
-
-```py
-def coinflip() -> bool:
-    return False
-
-def f():
-    if coinflip():
-        class A: ...
-    else:
-        class A: ...
-    super(A, A())  # error: [invalid-super-argument]
-```
-
 ### Instance Member Access via `super`
 
 Accessing instance members through `super()` is not allowed.

crates/ty_python_semantic/resources/mdtest/cycle.md

@@ -87,25 +87,25 @@ class C:
         def inner_a(positional=self.a):
             return
         self.a = inner_a
-        # revealed: def inner_a(positional=...) -> Unknown
+        # revealed: def inner_a(positional=Unknown | (def inner_a(positional=Unknown) -> Unknown)) -> Unknown
         reveal_type(inner_a)
 
         def inner_b(*, kw_only=self.b):
             return
         self.b = inner_b
-        # revealed: def inner_b(*, kw_only=...) -> Unknown
+        # revealed: def inner_b(*, kw_only=Unknown | (def inner_b(*, kw_only=Unknown) -> Unknown)) -> Unknown
         reveal_type(inner_b)
 
         def inner_c(positional_only=self.c, /):
             return
         self.c = inner_c
-        # revealed: def inner_c(positional_only=..., /) -> Unknown
+        # revealed: def inner_c(positional_only=Unknown | (def inner_c(positional_only=Unknown, /) -> Unknown), /) -> Unknown
         reveal_type(inner_c)
 
         def inner_d(*, kw_only=self.d):
             return
         self.d = inner_d
-        # revealed: def inner_d(*, kw_only=...) -> Unknown
+        # revealed: def inner_d(*, kw_only=Unknown | (def inner_d(*, kw_only=Unknown) -> Unknown)) -> Unknown
         reveal_type(inner_d)
 ```
 
@@ -114,7 +114,7 @@ We do, however, still check assignability of the default value to the parameter
 ```py
 class D:
     def f(self: "D"):
-        # error: [invalid-parameter-default] "Default value of type `Unknown | (def inner_a(a: int = ...) -> Unknown)` is not assignable to annotated parameter type `int`"
+        # error: [invalid-parameter-default] "Default value of type `Unknown | (def inner_a(a: int = Unknown | (def inner_a(a: int = Unknown) -> Unknown)) -> Unknown)` is not assignable to annotated parameter type `int`"
         def inner_a(a: int = self.a): ...
         self.a = inner_a
 ```
@@ -129,16 +129,16 @@ class C:
         self.c = lambda positional_only=self.c, /: positional_only
         self.d = lambda *, kw_only=self.d: kw_only
 
-        # revealed: (positional=...) -> Unknown
+        # revealed: (positional=Unknown | ((positional=Unknown) -> Unknown)) -> Unknown
         reveal_type(self.a)
 
-        # revealed: (*, kw_only=...) -> Unknown
+        # revealed: (*, kw_only=Unknown | ((*, kw_only=Unknown) -> Unknown)) -> Unknown
         reveal_type(self.b)
 
-        # revealed: (positional_only=..., /) -> Unknown
+        # revealed: (positional_only=Unknown | ((positional_only=Unknown, /) -> Unknown), /) -> Unknown
         reveal_type(self.c)
 
-        # revealed: (*, kw_only=...) -> Unknown
+        # revealed: (*, kw_only=Unknown | ((*, kw_only=Unknown) -> Unknown)) -> Unknown
         reveal_type(self.d)
 ```
 

crates/ty_python_semantic/resources/mdtest/dataclasses/dataclass_transform.md

@@ -643,91 +643,6 @@ reveal_type(Person.__init__)  # revealed: (self: Person, name: str) -> None
 Person(name="Alice")
 ```
 
-### Field specifiers using `**kwargs`
-
-Some field specifiers may use `**kwargs` to pass through standard parameters like `default`,
-`default_factory`, `init`, `kw_only`, and `alias`. This section tests that all these parameters work
-correctly when passed via `**kwargs` for all three kinds of transformers.
-
-#### Function-based transformer
-
-```py
-from typing import Any
-from typing_extensions import dataclass_transform
-
-def field(**kwargs: Any) -> Any: ...
-@dataclass_transform(field_specifiers=(field,))
-def create_model[T](cls: type[T]) -> type[T]:
-    return cls
-
-@create_model
-class Person:
-    id: int = field(init=False)
-    name: str
-    age: int = field(default=0)
-    tags: list[str] = field(default_factory=list)
-    email: str = field(kw_only=True)
-    internal_notes: str = field(alias="notes")
-
-# revealed: (self: Person, name: str, age: int = ..., tags: list[str] = ..., notes: str, *, email: str) -> None
-reveal_type(Person.__init__)
-
-Person("Alice", 30, [], "some notes", email="alice@example.com")
-Person("Bob", email="bob@example.com", notes="other notes")
-```
-
-#### Metaclass-based transformer
-
-```py
-from typing import Any
-from typing_extensions import dataclass_transform
-
-def field(**kwargs: Any) -> Any: ...
-@dataclass_transform(field_specifiers=(field,))
-class ModelMeta(type): ...
-
-class ModelBase(metaclass=ModelMeta): ...
-
-class Person(ModelBase):
-    id: int = field(init=False)
-    name: str
-    age: int = field(default=0)
-    tags: list[str] = field(default_factory=list)
-    email: str = field(kw_only=True)
-    internal_notes: str = field(alias="notes")
-
-# revealed: (self: Person, name: str, age: int = ..., tags: list[str] = ..., notes: str, *, email: str) -> None
-reveal_type(Person.__init__)
-
-Person("Alice", 30, [], "some notes", email="alice@example.com")
-Person("Bob", email="bob@example.com", notes="other notes")
-```
-
-#### Base-class-based transformer
-
-```py
-from typing import Any
-from typing_extensions import dataclass_transform
-
-def field(**kwargs: Any) -> Any: ...
-@dataclass_transform(field_specifiers=(field,))
-class ModelBase: ...
-
-class Person(ModelBase):
-    id: int = field(init=False)
-    name: str
-    age: int = field(default=0)
-    tags: list[str] = field(default_factory=list)
-    email: str = field(kw_only=True)
-    internal_notes: str = field(alias="notes")
-
-# revealed: (self: Person, name: str, age: int = ..., tags: list[str] = ..., notes: str, *, email: str) -> None
-reveal_type(Person.__init__)
-
-Person("Alice", 30, [], "some notes", email="alice@example.com")
-Person("Bob", email="bob@example.com", notes="other notes")
-```
-
 ### Support for `alias`
 
 The `alias` parameter in field specifiers allows providing an alternative name for the parameter in
@@ -834,8 +749,8 @@ class Outer:
     outer_a: int = outer_field(init=False)
     outer_b: str = inner_field(init=False)
 
-reveal_type(Outer.__init__)  # revealed: (self: Outer, outer_b: str = ...) -> None
-reveal_type(Outer.Inner.__init__)  # revealed: (self: Inner, inner_b: str = ...) -> None
+reveal_type(Outer.__init__)  # revealed: (self: Outer, outer_b: str = Any) -> None
+reveal_type(Outer.Inner.__init__)  # revealed: (self: Inner, inner_b: str = Any) -> None
 ```
 
 ## Overloaded dataclass-like decorators
@@ -953,83 +868,4 @@ reveal_type(t.key)  # revealed: int
 reveal_type(t.name)  # revealed: str
 ```
 
-## `__dataclass_fields__` and `DataclassInstance` protocol
-
-Classes created via `dataclass_transform` should have `__dataclass_fields__` and
-`__dataclass_params__` attributes, allowing them to satisfy the `DataclassInstance` protocol. This
-enables use of `dataclasses.fields`, `dataclasses.asdict`, `dataclasses.replace`, etc.
-
-### Function-based transformer
-
-```py
-from dataclasses import fields, asdict, replace, Field
-from typing import dataclass_transform, Any
-
-@dataclass_transform()
-def create_model[T](cls: type[T]) -> type[T]:
-    return cls
-
-@create_model
-class Person:
-    name: str
-    age: int
-
-p = Person("Alice", 30)
-
-reveal_type(Person.__dataclass_fields__)  # revealed: dict[str, Field[Any]]
-reveal_type(p.__dataclass_fields__)  # revealed: dict[str, Field[Any]]
-
-reveal_type(fields(Person))  # revealed: tuple[Field[Any], ...]
-reveal_type(asdict(p))  # revealed: dict[str, Any]
-reveal_type(replace(p, name="Bob"))  # revealed: Person
-```
-
-### Metaclass-based transformer
-
-```py
-from dataclasses import fields, asdict, replace, Field
-from typing import dataclass_transform, Any
-
-@dataclass_transform()
-class ModelMeta(type): ...
-
-class ModelBase(metaclass=ModelMeta): ...
-
-class Person(ModelBase):
-    name: str
-    age: int
-
-p = Person("Alice", 30)
-
-reveal_type(Person.__dataclass_fields__)  # revealed: dict[str, Field[Any]]
-reveal_type(p.__dataclass_fields__)  # revealed: dict[str, Field[Any]]
-
-reveal_type(fields(Person))  # revealed: tuple[Field[Any], ...]
-reveal_type(asdict(p))  # revealed: dict[str, Any]
-reveal_type(replace(p, name="Bob"))  # revealed: Person
-```
-
-### Base-class-based transformer
-
-```py
-from dataclasses import fields, asdict, replace, Field
-from typing import dataclass_transform, Any
-
-@dataclass_transform()
-class ModelBase: ...
-
-class Person(ModelBase):
-    name: str
-    age: int
-
-p = Person("Alice", 30)
-
-reveal_type(Person.__dataclass_fields__)  # revealed: dict[str, Field[Any]]
-reveal_type(p.__dataclass_fields__)  # revealed: dict[str, Field[Any]]
-
-reveal_type(fields(Person))  # revealed: tuple[Field[Any], ...]
-reveal_type(asdict(p))  # revealed: dict[str, Any]
-reveal_type(replace(p, name="Bob"))  # revealed: Person
-```
-
 [`typing.dataclass_transform`]: https://docs.python.org/3/library/typing.html#typing.dataclass_transform

crates/ty_python_semantic/resources/mdtest/dataclasses/dataclasses.md

@@ -69,7 +69,7 @@ class D:
     y: str = "default"
     z: int | None = 1 + 2
 
-reveal_type(D.__init__)  # revealed: (self: D, x: int, y: str = "default", z: int | None = 3) -> None
+reveal_type(D.__init__)  # revealed: (self: D, x: int, y: str = Literal["default"], z: int | None = Literal[3]) -> None
 ```
 
 This also works if the declaration and binding are split:
@@ -221,7 +221,7 @@ class D:
     (x): int = 1
 
 # TODO: should ideally not include a `x` parameter
-reveal_type(D.__init__)  # revealed:(self: D, x: int = 1) -> None
+reveal_type(D.__init__)  # revealed: (self: D, x: int = Literal[1]) -> None
 ```
 
 ## `@dataclass` calls with arguments
@@ -670,7 +670,7 @@ class A:
     a: str = field(kw_only=False)
     b: int = 0
 
-reveal_type(A.__init__)  # revealed:(self: A, a: str, *, b: int = 0) -> None
+reveal_type(A.__init__)  # revealed: (self: A, a: str, *, b: int = Literal[0]) -> None
 
 A("hi")
 ```
@@ -991,7 +991,7 @@ class C:
     class_variable1: ClassVar[Final[int]] = 1
     class_variable2: ClassVar[Final[int]] = 1
 
-reveal_type(C.__init__)  # revealed:(self: C, instance_variable_no_default: int, instance_variable: int = 1) -> None
+reveal_type(C.__init__)  # revealed: (self: C, instance_variable_no_default: int, instance_variable: int = Literal[1]) -> None
 
 c = C(1)
 # error: [invalid-assignment] "Cannot assign to final attribute `instance_variable` on type `C`"
@@ -1082,7 +1082,7 @@ class C(Base):
     z: int = 10
     x: int = 15
 
-reveal_type(C.__init__)  # revealed:(self: C, x: int = 15, y: int = 0, z: int = 10) -> None
+reveal_type(C.__init__)  # revealed: (self: C, x: int = Literal[15], y: int = Literal[0], z: int = Literal[10]) -> None
 ```
 
 ## Conditionally defined fields
@@ -1243,7 +1243,7 @@ class UppercaseString:
 class C:
     upper: UppercaseString = UppercaseString()
 
-reveal_type(C.__init__)  # revealed: (self: C, upper: str = ...) -> None
+reveal_type(C.__init__)  # revealed: (self: C, upper: str = str) -> None
 
 c = C("abc")
 reveal_type(c.upper)  # revealed: str
@@ -1289,7 +1289,7 @@ class ConvertToLength:
 class C:
     converter: ConvertToLength = ConvertToLength()
 
-reveal_type(C.__init__)  # revealed: (self: C, converter: str = "") -> None
+reveal_type(C.__init__)  # revealed: (self: C, converter: str = Literal[""]) -> None
 
 c = C("abc")
 reveal_type(c.converter)  # revealed: int
@@ -1328,7 +1328,7 @@ class AcceptsStrAndInt:
 class C:
     field: AcceptsStrAndInt = AcceptsStrAndInt()
 
-reveal_type(C.__init__)  # revealed: (self: C, field: str | int = ...) -> None
+reveal_type(C.__init__)  # revealed: (self: C, field: str | int = int) -> None
 ```
 
 ## `dataclasses.field`

crates/ty_python_semantic/resources/mdtest/dataclasses/fields.md

@@ -11,7 +11,7 @@ class Member:
     role: str = field(default="user")
     tag: str | None = field(default=None, init=False)
 
-# revealed: (self: Member, name: str, role: str = "user") -> None
+# revealed: (self: Member, name: str, role: str = Literal["user"]) -> None
 reveal_type(Member.__init__)
 
 alice = Member(name="Alice", role="admin")
@@ -37,7 +37,7 @@ class Data:
     content: list[int] = field(default_factory=list)
     timestamp: datetime = field(default_factory=datetime.now, init=False)
 
-# revealed: (self: Data, content: list[int] = ...) -> None
+# revealed: (self: Data, content: list[int] = list[int]) -> None
 reveal_type(Data.__init__)
 
 data = Data([1, 2, 3])
@@ -63,7 +63,7 @@ class Person:
     age: int | None = field(default=None, kw_only=True)
     role: str = field(default="user", kw_only=True)
 
-# revealed: (self: Person, name: str, *, age: int | None = None, role: str = "user") -> None
+# revealed: (self: Person, name: str, *, age: int | None = None, role: str = Literal["user"]) -> None
 reveal_type(Person.__init__)
 
 alice = Person(role="admin", name="Alice")
@@ -82,7 +82,8 @@ def get_default() -> str:
 
 reveal_type(field(default=1))  # revealed: dataclasses.Field[Literal[1]]
 reveal_type(field(default=None))  # revealed: dataclasses.Field[None]
-reveal_type(field(default_factory=get_default))  # revealed: dataclasses.Field[str]
+# TODO: this could ideally be `dataclasses.Field[str]` with a better generics solver
+reveal_type(field(default_factory=get_default))  # revealed: dataclasses.Field[Unknown]
 ```
 
 ## dataclass_transform field_specifiers

crates/ty_python_semantic/resources/mdtest/decorators.md

@@ -144,10 +144,11 @@ from functools import cache
 def f(x: int) -> int:
     return x**2
 
-# revealed: _lru_cache_wrapper[int]
-reveal_type(f)
-# revealed: int
-reveal_type(f(1))
+# TODO: Should be `_lru_cache_wrapper[int]`
+reveal_type(f)  # revealed: _lru_cache_wrapper[Unknown]
+
+# TODO: Should be `int`
+reveal_type(f(1))  # revealed: Unknown
 ```
 
 ## Lambdas as decorators