[ty] Add from imports to imported_modules *if* the module being imported is not relative to the current module

.github/workflows/ci.yaml

@@ -261,15 +261,15 @@ jobs:
       - name: "Install mold"
         uses: rui314/setup-mold@725a8794d15fc7563f59595bd9556495c0564878 # v1
       - name: "Install cargo nextest"
-        uses: taiki-e/install-action@f79fe7514db78f0a7bdba3cb6dd9c1baa7d046d9 # v2.62.56
+        uses: taiki-e/install-action@537c30d2b45cc3aa3fb35e2bbcfb61ef93fd6f02 # v2.62.52
         with:
           tool: cargo-nextest
       - name: "Install cargo insta"
-        uses: taiki-e/install-action@f79fe7514db78f0a7bdba3cb6dd9c1baa7d046d9 # v2.62.56
+        uses: taiki-e/install-action@537c30d2b45cc3aa3fb35e2bbcfb61ef93fd6f02 # v2.62.52
         with:
           tool: cargo-insta
       - name: "Install uv"
-        uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # v7.1.4
+        uses: astral-sh/setup-uv@5a7eac68fb9809dea845d802897dc5c723910fa3 # v7.1.3
         with:
           enable-cache: "true"
       - name: ty mdtests (GitHub annotations)
@@ -284,10 +284,6 @@ jobs:
         run: cargo insta test --all-features --unreferenced reject --test-runner nextest
       - name: Dogfood ty on py-fuzzer
         run: uv run --project=./python/py-fuzzer cargo run -p ty check --project=./python/py-fuzzer
-      - name: Dogfood ty on the scripts directory
-        run: uv run --project=./scripts cargo run -p ty check --project=./scripts
-      - name: Dogfood ty on ty_benchmark
-        run: uv run --project=./scripts/ty_benchmark cargo run -p ty check --project=./scripts/ty_benchmark
       # Check for broken links in the documentation.
       - run: cargo doc --all --no-deps
         env:
@@ -323,11 +319,11 @@ jobs:
       - name: "Install mold"
         uses: rui314/setup-mold@725a8794d15fc7563f59595bd9556495c0564878 # v1
       - name: "Install cargo nextest"
-        uses: taiki-e/install-action@f79fe7514db78f0a7bdba3cb6dd9c1baa7d046d9 # v2.62.56
+        uses: taiki-e/install-action@537c30d2b45cc3aa3fb35e2bbcfb61ef93fd6f02 # v2.62.52
         with:
           tool: cargo-nextest
       - name: "Install uv"
-        uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # v7.1.4
+        uses: astral-sh/setup-uv@5a7eac68fb9809dea845d802897dc5c723910fa3 # v7.1.3
         with:
           enable-cache: "true"
       - name: "Run tests"
@@ -356,11 +352,11 @@ jobs:
       - name: "Install Rust toolchain"
         run: rustup show
       - name: "Install cargo nextest"
-        uses: taiki-e/install-action@f79fe7514db78f0a7bdba3cb6dd9c1baa7d046d9 # v2.62.56
+        uses: taiki-e/install-action@537c30d2b45cc3aa3fb35e2bbcfb61ef93fd6f02 # v2.62.52
         with:
           tool: cargo-nextest
       - name: "Install uv"
-        uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # v7.1.4
+        uses: astral-sh/setup-uv@5a7eac68fb9809dea845d802897dc5c723910fa3 # v7.1.3
         with:
           enable-cache: "true"
       - name: "Run tests"
@@ -466,7 +462,7 @@ jobs:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           persist-credentials: false
-      - uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # v7.1.4
+      - uses: astral-sh/setup-uv@5a7eac68fb9809dea845d802897dc5c723910fa3 # v7.1.3
       - uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
         with:
           shared-key: ruff-linux-debug
@@ -501,7 +497,7 @@ jobs:
       - uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
         with:
           save-if: ${{ github.ref == 'refs/heads/main' }}
-      - uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # v7.1.4
+      - uses: astral-sh/setup-uv@5a7eac68fb9809dea845d802897dc5c723910fa3 # v7.1.3
       - name: "Install Rust toolchain"
         run: rustup component add rustfmt
       # Run all code generation scripts, and verify that the current output is
@@ -536,7 +532,7 @@ jobs:
           ref: ${{ github.event.pull_request.base.ref }}
           persist-credentials: false
 
-      - uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # v7.1.4
+      - uses: astral-sh/setup-uv@5a7eac68fb9809dea845d802897dc5c723910fa3 # v7.1.3
         with:
           python-version: ${{ env.PYTHON_VERSION }}
           activate-environment: true
@@ -642,7 +638,7 @@ jobs:
         with:
           fetch-depth: 0
           persist-credentials: false
-      - uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # v7.1.4
+      - uses: astral-sh/setup-uv@5a7eac68fb9809dea845d802897dc5c723910fa3 # v7.1.3
       - uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
         with:
           save-if: ${{ github.ref == 'refs/heads/main' }}
@@ -701,7 +697,7 @@ jobs:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           persist-credentials: false
-      - uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # v7.1.4
+      - uses: astral-sh/setup-uv@5a7eac68fb9809dea845d802897dc5c723910fa3 # v7.1.3
       - uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
         with:
           save-if: ${{ github.ref == 'refs/heads/main' }}
@@ -752,7 +748,7 @@ jobs:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           persist-credentials: false
-      - uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # v7.1.4
+      - uses: astral-sh/setup-uv@5a7eac68fb9809dea845d802897dc5c723910fa3 # v7.1.3
       - uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
         with:
           save-if: ${{ github.ref == 'refs/heads/main' }}
@@ -796,7 +792,7 @@ jobs:
       - name: "Install Rust toolchain"
         run: rustup show
       - name: Install uv
-        uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # v7.1.4
+        uses: astral-sh/setup-uv@5a7eac68fb9809dea845d802897dc5c723910fa3 # v7.1.3
         with:
           python-version: 3.13
           activate-environment: true
@@ -951,13 +947,13 @@ jobs:
       - uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
         with:
           save-if: ${{ github.ref == 'refs/heads/main' }}
-      - uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # v7.1.4
+      - uses: astral-sh/setup-uv@5a7eac68fb9809dea845d802897dc5c723910fa3 # v7.1.3
 
       - name: "Install Rust toolchain"
         run: rustup show
 
       - name: "Install codspeed"
-        uses: taiki-e/install-action@f79fe7514db78f0a7bdba3cb6dd9c1baa7d046d9 # v2.62.56
+        uses: taiki-e/install-action@537c30d2b45cc3aa3fb35e2bbcfb61ef93fd6f02 # v2.62.52
         with:
           tool: cargo-codspeed
 
@@ -991,13 +987,13 @@ jobs:
       - uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
         with:
           save-if: ${{ github.ref == 'refs/heads/main' }}
-      - uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # v7.1.4
+      - uses: astral-sh/setup-uv@5a7eac68fb9809dea845d802897dc5c723910fa3 # v7.1.3
 
       - name: "Install Rust toolchain"
         run: rustup show
 
       - name: "Install codspeed"
-        uses: taiki-e/install-action@f79fe7514db78f0a7bdba3cb6dd9c1baa7d046d9 # v2.62.56
+        uses: taiki-e/install-action@537c30d2b45cc3aa3fb35e2bbcfb61ef93fd6f02 # v2.62.52
         with:
           tool: cargo-codspeed
 
@@ -1031,13 +1027,13 @@ jobs:
       - uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
         with:
           save-if: ${{ github.ref == 'refs/heads/main' }}
-      - uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # v7.1.4
+      - uses: astral-sh/setup-uv@5a7eac68fb9809dea845d802897dc5c723910fa3 # v7.1.3
 
       - name: "Install Rust toolchain"
         run: rustup show
 
       - name: "Install codspeed"
-        uses: taiki-e/install-action@f79fe7514db78f0a7bdba3cb6dd9c1baa7d046d9 # v2.62.56
+        uses: taiki-e/install-action@537c30d2b45cc3aa3fb35e2bbcfb61ef93fd6f02 # v2.62.52
         with:
           tool: cargo-codspeed
 

.github/workflows/daily_fuzz.yaml

@@ -34,7 +34,7 @@ jobs:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           persist-credentials: false
-      - uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # v7.1.4
+      - uses: astral-sh/setup-uv@5a7eac68fb9809dea845d802897dc5c723910fa3 # v7.1.3
       - name: "Install Rust toolchain"
         run: rustup show
       - name: "Install mold"

.github/workflows/mypy_primer.yaml

@@ -43,7 +43,7 @@ jobs:
           persist-credentials: false
 
       - name: Install the latest version of uv
-        uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # v7.1.4
+        uses: astral-sh/setup-uv@5a7eac68fb9809dea845d802897dc5c723910fa3 # v7.1.3
 
       - uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
         with:
@@ -81,7 +81,7 @@ jobs:
           persist-credentials: false
 
       - name: Install the latest version of uv
-        uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # v7.1.4
+        uses: astral-sh/setup-uv@5a7eac68fb9809dea845d802897dc5c723910fa3 # v7.1.3
 
       - uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
         with:

.github/workflows/publish-pypi.yml

@@ -22,7 +22,7 @@ jobs:
       id-token: write
     steps:
       - name: "Install uv"
-        uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # v7.1.4
+        uses: astral-sh/setup-uv@5a7eac68fb9809dea845d802897dc5c723910fa3 # v7.1.3
       - uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
         with:
           pattern: wheels-*

.github/workflows/release.yml

@@ -60,7 +60,7 @@ jobs:
     env:
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
-      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
+      - uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493
         with:
           persist-credentials: false
           submodules: recursive
@@ -123,7 +123,7 @@ jobs:
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       BUILD_MANIFEST_NAME: target/distrib/global-dist-manifest.json
     steps:
-      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
+      - uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493
         with:
           persist-credentials: false
           submodules: recursive
@@ -174,7 +174,7 @@ jobs:
     outputs:
       val: ${{ steps.host.outputs.manifest }}
     steps:
-      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
+      - uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493
         with:
           persist-credentials: false
           submodules: recursive
@@ -250,7 +250,7 @@ jobs:
     env:
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
-      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
+      - uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493
         with:
           persist-credentials: false
           submodules: recursive

.github/workflows/sync_typeshed.yaml

@@ -77,7 +77,7 @@ jobs:
         run: |
           git config --global user.name typeshedbot
           git config --global user.email '<>'
-      - uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # v7.1.4
+      - uses: astral-sh/setup-uv@5a7eac68fb9809dea845d802897dc5c723910fa3 # v7.1.3
       - name: Sync typeshed stubs
         run: |
           rm -rf "ruff/${VENDORED_TYPESHED}"
@@ -131,7 +131,7 @@ jobs:
         with:
           persist-credentials: true
           ref: ${{ env.UPSTREAM_BRANCH}}
-      - uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # v7.1.4
+      - uses: astral-sh/setup-uv@5a7eac68fb9809dea845d802897dc5c723910fa3 # v7.1.3
       - name: Setup git
         run: |
           git config --global user.name typeshedbot
@@ -170,7 +170,7 @@ jobs:
         with:
           persist-credentials: true
           ref: ${{ env.UPSTREAM_BRANCH}}
-      - uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # v7.1.4
+      - uses: astral-sh/setup-uv@5a7eac68fb9809dea845d802897dc5c723910fa3 # v7.1.3
       - name: Setup git
         run: |
           git config --global user.name typeshedbot
@@ -207,12 +207,12 @@ jobs:
         uses: rui314/setup-mold@725a8794d15fc7563f59595bd9556495c0564878 # v1
       - name: "Install cargo nextest"
         if: ${{ success() }}
-        uses: taiki-e/install-action@f79fe7514db78f0a7bdba3cb6dd9c1baa7d046d9 # v2.62.56
+        uses: taiki-e/install-action@537c30d2b45cc3aa3fb35e2bbcfb61ef93fd6f02 # v2.62.52
         with:
           tool: cargo-nextest
       - name: "Install cargo insta"
         if: ${{ success() }}
-        uses: taiki-e/install-action@f79fe7514db78f0a7bdba3cb6dd9c1baa7d046d9 # v2.62.56
+        uses: taiki-e/install-action@537c30d2b45cc3aa3fb35e2bbcfb61ef93fd6f02 # v2.62.52
         with:
           tool: cargo-insta
       - name: Update snapshots

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

@@ -33,7 +33,7 @@ jobs:
           persist-credentials: false
 
       - name: Install the latest version of uv
-        uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # v7.1.4
+        uses: astral-sh/setup-uv@5a7eac68fb9809dea845d802897dc5c723910fa3 # v7.1.3
         with:
           enable-cache: true # zizmor: ignore[cache-poisoning] acceptable risk for CloudFlare pages artifact
 
@@ -67,7 +67,7 @@ jobs:
 
           cd ..
 
-          uv tool install "git+https://github.com/astral-sh/ecosystem-analyzer@55df3c868f3fa9ab34cff0498dd6106722aac205"
+          uv tool install "git+https://github.com/astral-sh/ecosystem-analyzer@e26ebfb78d372b8b091e1cb1d6fc522e135474c1"
 
           ecosystem-analyzer \
             --repository ruff \

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

@@ -29,7 +29,7 @@ jobs:
           persist-credentials: false
 
       - name: Install the latest version of uv
-        uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # v7.1.4
+        uses: astral-sh/setup-uv@5a7eac68fb9809dea845d802897dc5c723910fa3 # v7.1.3
         with:
           enable-cache: true # zizmor: ignore[cache-poisoning] acceptable risk for CloudFlare pages artifact
 
@@ -52,7 +52,7 @@ jobs:
 
           cd ..
 
-          uv tool install "git+https://github.com/astral-sh/ecosystem-analyzer@55df3c868f3fa9ab34cff0498dd6106722aac205"
+          uv tool install "git+https://github.com/astral-sh/ecosystem-analyzer@e26ebfb78d372b8b091e1cb1d6fc522e135474c1"
 
           ecosystem-analyzer \
             --verbose \

.vscode/settings.json

@@ -5,6 +5,5 @@
     "rust-analyzer.check.command": "clippy",
     "search.exclude": {
         "**/*.snap": true
-    },
-    "ty.diagnosticMode": "openFilesOnly"
+    }
 }

CHANGELOG.md

@@ -1,40 +1,5 @@
 # Changelog
 
-## 0.14.7
-
-Released on 2025-11-28.
-
-### Preview features
-
-- \[`flake8-bandit`\] Handle string literal bindings in suspicious-url-open-usage (`S310`) ([#21469](https://github.com/astral-sh/ruff/pull/21469))
-- \[`pylint`\] Fix `PLR1708` false positives on nested functions ([#21177](https://github.com/astral-sh/ruff/pull/21177))
-- \[`pylint`\] Fix suppression for empty dict without tuple key annotation (`PLE1141`) ([#21290](https://github.com/astral-sh/ruff/pull/21290))
-- \[`ruff`\] Add rule `RUF066` to detect unnecessary class properties ([#21535](https://github.com/astral-sh/ruff/pull/21535))
-- \[`ruff`\] Catch more dummy variable uses (`RUF052`) ([#19799](https://github.com/astral-sh/ruff/pull/19799))
-
-### Bug fixes
-
-- [server] Set severity for non-rule diagnostics ([#21559](https://github.com/astral-sh/ruff/pull/21559))
-- \[`flake8-implicit-str-concat`\] Avoid invalid fix in (`ISC003`) ([#21517](https://github.com/astral-sh/ruff/pull/21517))
-- \[`parser`\] Fix panic when parsing IPython escape command expressions ([#21480](https://github.com/astral-sh/ruff/pull/21480))
-
-### CLI
-
-- Show partial fixability indicator in statistics output ([#21513](https://github.com/astral-sh/ruff/pull/21513))
-
-### Contributors
-
-- [@mikeleppane](https://github.com/mikeleppane)
-- [@senekor](https://github.com/senekor)
-- [@ShaharNaveh](https://github.com/ShaharNaveh)
-- [@JumboBear](https://github.com/JumboBear)
-- [@prakhar1144](https://github.com/prakhar1144)
-- [@tsvikas](https://github.com/tsvikas)
-- [@danparizher](https://github.com/danparizher)
-- [@chirizxc](https://github.com/chirizxc)
-- [@AlexWaygood](https://github.com/AlexWaygood)
-- [@MichaReiser](https://github.com/MichaReiser)
-
 ## 0.14.6
 
 Released on 2025-11-21.

Cargo.lock

@@ -442,9 +442,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.53"
+version = "4.5.51"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9e340e012a1bf4935f5282ed1436d1489548e8f72308207ea5df0e23d2d03f8"
+checksum = "4c26d721170e0295f191a69bd9a1f93efcdb0aff38684b61ab5750468972e5f5"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -452,9 +452,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.53"
+version = "4.5.51"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d76b5d13eaa18c901fd2f7fca939fefe3a0727a953561fefdf3b2922b8569d00"
+checksum = "75835f0c7bf681bfd05abe44e965760fea999a5286c6eb2d59883634fd02011a"
 dependencies = [
  "anstream",
  "anstyle",
@@ -1016,7 +1016,7 @@ dependencies = [
  "libc",
  "option-ext",
  "redox_users",
- "windows-sys 0.59.0",
+ "windows-sys 0.61.0",
 ]
 
 [[package]]
@@ -1108,7 +1108,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
 dependencies = [
  "libc",
- "windows-sys 0.52.0",
+ "windows-sys 0.61.0",
 ]
 
 [[package]]
@@ -1255,7 +1255,7 @@ checksum = "ac7bb8710e1f09672102be7ddf39f764d8440ae74a9f4e30aaa4820dcdffa4af"
 dependencies = [
  "compact_str",
  "get-size-derive2",
- "hashbrown 0.16.1",
+ "hashbrown 0.16.0",
  "indexmap",
  "smallvec",
 ]
@@ -1353,9 +1353,9 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.16.1"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100"
+checksum = "5419bdc4f6a9207fbeba6d11b604d481addf78ecd10c11ad51e76c2f6482748d"
 dependencies = [
  "equivalent",
 ]
@@ -1564,12 +1564,12 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.12.1"
+version = "2.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ad4bb2b565bca0645f4d68c5c9af97fba094e9791da685bf83cb5f3ce74acf2"
+checksum = "6717a8d2a5a929a1a2eb43a12812498ed141a0bcfb7e8f7844fbdbe4303bba9f"
 dependencies = [
  "equivalent",
- "hashbrown 0.16.1",
+ "hashbrown 0.16.0",
  "serde",
  "serde_core",
 ]
@@ -1763,7 +1763,7 @@ dependencies = [
  "portable-atomic",
  "portable-atomic-util",
  "serde_core",
- "windows-sys 0.52.0",
+ "windows-sys 0.61.0",
 ]
 
 [[package]]
@@ -2859,7 +2859,7 @@ dependencies = [
 
 [[package]]
 name = "ruff"
-version = "0.14.7"
+version = "0.14.6"
 dependencies = [
  "anyhow",
  "argfile",
@@ -3117,7 +3117,7 @@ dependencies = [
 
 [[package]]
 name = "ruff_linter"
-version = "0.14.7"
+version = "0.14.6"
 dependencies = [
  "aho-corasick",
  "anyhow",
@@ -3127,7 +3127,7 @@ dependencies = [
  "fern",
  "glob",
  "globset",
- "hashbrown 0.16.1",
+ "hashbrown 0.16.0",
  "imperative",
  "insta",
  "is-macro",
@@ -3472,7 +3472,7 @@ dependencies = [
 
 [[package]]
 name = "ruff_wasm"
-version = "0.14.7"
+version = "0.14.6"
 dependencies = [
  "console_error_panic_hook",
  "console_log",
@@ -3570,7 +3570,7 @@ dependencies = [
  "errno",
  "libc",
  "linux-raw-sys",
- "windows-sys 0.52.0",
+ "windows-sys 0.61.0",
 ]
 
 [[package]]
@@ -3935,9 +3935,9 @@ checksum = "804f44ed3c63152de6a9f90acbea1a110441de43006ea51bcce8f436196a288b"
 
 [[package]]
 name = "syn"
-version = "2.0.111"
+version = "2.0.110"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "390cc9a294ab71bdb1aa2e99d13be9c753cd2d7bd6560c77118597410c4d2e87"
+checksum = "a99801b5bd34ede4cf3fc688c5919368fea4e4814a4664359503e6015b280aea"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3971,7 +3971,7 @@ dependencies = [
  "getrandom 0.3.4",
  "once_cell",
  "rustix",
- "windows-sys 0.52.0",
+ "windows-sys 0.61.0",
 ]
 
 [[package]]
@@ -4462,7 +4462,7 @@ dependencies = [
  "drop_bomb",
  "get-size2",
  "glob",
- "hashbrown 0.16.1",
+ "hashbrown 0.16.0",
  "indexmap",
  "indoc",
  "insta",
@@ -4474,7 +4474,6 @@ dependencies = [
  "quickcheck_macros",
  "ruff_annotate_snippets",
  "ruff_db",
- "ruff_diagnostics",
  "ruff_index",
  "ruff_macros",
  "ruff_memory_usage",
@@ -4520,7 +4519,6 @@ dependencies = [
  "lsp-types",
  "regex",
  "ruff_db",
- "ruff_diagnostics",
  "ruff_macros",
  "ruff_notebook",
  "ruff_python_ast",
@@ -4561,7 +4559,6 @@ dependencies = [
  "path-slash",
  "regex",
  "ruff_db",
- "ruff_diagnostics",
  "ruff_index",
  "ruff_notebook",
  "ruff_python_ast",
@@ -4603,7 +4600,6 @@ dependencies = [
  "js-sys",
  "log",
  "ruff_db",
- "ruff_diagnostics",
  "ruff_notebook",
  "ruff_python_formatter",
  "ruff_source_file",
@@ -5024,7 +5020,7 @@ version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
 dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.61.0",
 ]
 
 [[package]]

README.md

@@ -147,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.7/install.sh | sh
-powershell -c "irm https://astral.sh/ruff/0.14.7/install.ps1 | iex"
+curl -LsSf https://astral.sh/ruff/0.14.6/install.sh | sh
+powershell -c "irm https://astral.sh/ruff/0.14.6/install.ps1 | iex"
 ```
 
 You can also install Ruff via [Homebrew](https://formulae.brew.sh/formula/ruff), [Conda](https://anaconda.org/conda-forge/ruff),
@@ -181,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.7
+  rev: v0.14.6
   hooks:
     # Run the linter.
     - id: ruff-check

crates/ruff/Cargo.toml

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

crates/ruff/src/printer.rs

@@ -34,21 +34,9 @@ struct ExpandedStatistics<'a> {
     code: Option<&'a SecondaryCode>,
     name: &'static str,
     count: usize,
-    #[serde(rename = "fixable")]
-    all_fixable: bool,
-    fixable_count: usize,
+    fixable: bool,
 }
 
-impl ExpandedStatistics<'_> {
-    fn any_fixable(&self) -> bool {
-        self.fixable_count > 0
-    }
-}
-
-/// Accumulator type for grouping diagnostics by code.
-/// Format: (`code`, `representative_diagnostic`, `total_count`, `fixable_count`)
-type DiagnosticGroup<'a> = (Option<&'a SecondaryCode>, &'a Diagnostic, usize, usize);
-
 pub(crate) struct Printer {
     format: OutputFormat,
     log_level: LogLevel,
@@ -145,7 +133,7 @@ impl Printer {
                         if fixables.applicable > 0 {
                             writeln!(
                                 writer,
-                                "{fix_prefix} {} fixable with the `--fix` option.",
+                                "{fix_prefix} {} fixable with the --fix option.",
                                 fixables.applicable
                             )?;
                         }
@@ -268,41 +256,35 @@ impl Printer {
         diagnostics: &Diagnostics,
         writer: &mut dyn Write,
     ) -> Result<()> {
-        let required_applicability = self.unsafe_fixes.required_applicability();
         let statistics: Vec<ExpandedStatistics> = diagnostics
             .inner
             .iter()
-            .sorted_by_key(|diagnostic| diagnostic.secondary_code())
-            .fold(vec![], |mut acc: Vec<DiagnosticGroup>, diagnostic| {
-                let is_fixable = diagnostic
-                    .fix()
-                    .is_some_and(|fix| fix.applies(required_applicability));
-                let code = diagnostic.secondary_code();
-
-                if let Some((prev_code, _prev_message, count, fixable_count)) = acc.last_mut() {
-                    if *prev_code == code {
-                        *count += 1;
-                        if is_fixable {
-                            *fixable_count += 1;
+            .map(|message| (message.secondary_code(), message))
+            .sorted_by_key(|(code, message)| (*code, message.fixable()))
+            .fold(
+                vec![],
+                |mut acc: Vec<((Option<&SecondaryCode>, &Diagnostic), usize)>, (code, message)| {
+                    if let Some(((prev_code, _prev_message), count)) = acc.last_mut() {
+                        if *prev_code == code {
+                            *count += 1;
+                            return acc;
                         }
-                        return acc;
                     }
-                }
-                acc.push((code, diagnostic, 1, usize::from(is_fixable)));
-                acc
-            })
-            .iter()
-            .map(
-                |&(code, message, count, fixable_count)| ExpandedStatistics {
-                    code,
-                    name: message.name(),
-                    count,
-                    // Backward compatibility: `fixable` is true only when all violations are fixable.
-                    // See: https://github.com/astral-sh/ruff/pull/21513
-                    all_fixable: fixable_count == count,
-                    fixable_count,
+                    acc.push(((code, message), 1));
+                    acc
                 },
             )
+            .iter()
+            .map(|&((code, message), count)| ExpandedStatistics {
+                code,
+                name: message.name(),
+                count,
+                fixable: if let Some(fix) = message.fix() {
+                    fix.applies(self.unsafe_fixes.required_applicability())
+                } else {
+                    false
+                },
+            })
             .sorted_by_key(|statistic| Reverse(statistic.count))
             .collect();
 
@@ -326,14 +308,13 @@ impl Printer {
                     .map(|statistic| statistic.code.map_or(0, |s| s.len()))
                     .max()
                     .unwrap();
-                let any_fixable = statistics.iter().any(ExpandedStatistics::any_fixable);
+                let any_fixable = statistics.iter().any(|statistic| statistic.fixable);
 
-                let all_fixable = format!("[{}] ", "*".cyan());
-                let partially_fixable = format!("[{}] ", "-".cyan());
+                let fixable = format!("[{}] ", "*".cyan());
                 let unfixable = "[ ] ";
 
                 // By default, we mimic Flake8's `--statistics` format.
-                for statistic in &statistics {
+                for statistic in statistics {
                     writeln!(
                         writer,
                         "{:>count_width$}\t{:<code_width$}\t{}{}",
@@ -345,10 +326,8 @@ impl Printer {
                             .red()
                             .bold(),
                         if any_fixable {
-                            if statistic.all_fixable {
-                                &all_fixable
-                            } else if statistic.any_fixable() {
-                                &partially_fixable
+                            if statistic.fixable {
+                                &fixable
                             } else {
                                 unfixable
                             }

crates/ruff/tests/integration_test.rs

@@ -1043,7 +1043,7 @@ def mvce(keys, values):
     ----- stdout -----
     1	C416	[*] unnecessary-comprehension
     Found 1 error.
-    [*] 1 fixable with the `--fix` option.
+    [*] 1 fixable with the --fix option.
 
     ----- stderr -----
     ");
@@ -1073,8 +1073,7 @@ def mvce(keys, values):
         "code": "C416",
         "name": "unnecessary-comprehension",
         "count": 1,
-        "fixable": false,
-        "fixable_count": 0
+        "fixable": false
       }
     ]
 
@@ -1107,8 +1106,7 @@ def mvce(keys, values):
         "code": "C416",
         "name": "unnecessary-comprehension",
         "count": 1,
-        "fixable": true,
-        "fixable_count": 1
+        "fixable": true
       }
     ]
 
@@ -1116,54 +1114,6 @@ def mvce(keys, values):
     "#);
 }
 
-#[test]
-fn show_statistics_json_partial_fix() {
-    let mut cmd = RuffCheck::default()
-        .args([
-            "--select",
-            "UP035",
-            "--statistics",
-            "--output-format",
-            "json",
-        ])
-        .build();
-    assert_cmd_snapshot!(cmd
-        .pass_stdin("from typing import List, AsyncGenerator"), @r#"
-    success: false
-    exit_code: 1
-    ----- stdout -----
-    [
-      {
-        "code": "UP035",
-        "name": "deprecated-import",
-        "count": 2,
-        "fixable": false,
-        "fixable_count": 1
-      }
-    ]
-
-    ----- stderr -----
-    "#);
-}
-
-#[test]
-fn show_statistics_partial_fix() {
-    let mut cmd = RuffCheck::default()
-        .args(["--select", "UP035", "--statistics"])
-        .build();
-    assert_cmd_snapshot!(cmd
-        .pass_stdin("from typing import List, AsyncGenerator"), @r"
-    success: false
-    exit_code: 1
-    ----- stdout -----
-    2	UP035	[-] deprecated-import
-    Found 2 errors.
-    [*] 1 fixable with the `--fix` option.
-
-    ----- stderr -----
-    ");
-}
-
 #[test]
 fn show_statistics_syntax_errors() {
     let mut cmd = RuffCheck::default()
@@ -1860,7 +1810,7 @@ fn check_no_hint_for_hidden_unsafe_fixes_when_disabled() {
     --> -:1:1
 
     Found 2 errors.
-    [*] 1 fixable with the `--fix` option.
+    [*] 1 fixable with the --fix option.
 
     ----- stderr -----
     ");
@@ -1903,7 +1853,7 @@ fn check_shows_unsafe_fixes_with_opt_in() {
     --> -:1:1
 
     Found 2 errors.
-    [*] 2 fixable with the `--fix` option.
+    [*] 2 fixable with the --fix option.
 
     ----- stderr -----
     ");

crates/ruff_benchmark/Cargo.toml

@@ -59,6 +59,8 @@ divan = { workspace = true, optional = true }
 anyhow = { workspace = true }
 codspeed-criterion-compat = { workspace = true, default-features = false, optional = true }
 criterion = { workspace = true, default-features = false, optional = true }
+rayon = { workspace = true }
+rustc-hash = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
 tracing = { workspace = true }
@@ -86,7 +88,3 @@ mimalloc = { workspace = true }
 
 [target.'cfg(all(not(target_os = "windows"), not(target_os = "openbsd"), any(target_arch = "x86_64", target_arch = "aarch64", target_arch = "powerpc64", target_arch = "riscv64")))'.dev-dependencies]
 tikv-jemallocator = { workspace = true }
-
-[dev-dependencies]
-rustc-hash = { workspace = true }
-rayon = { workspace = true }

crates/ruff_benchmark/benches/ty_walltime.rs

@@ -120,7 +120,7 @@ static COLOUR_SCIENCE: Benchmark = Benchmark::new(
         max_dep_date: "2025-06-17",
         python_version: PythonVersion::PY310,
     },
-    1070,
+    600,
 );
 
 static FREQTRADE: Benchmark = Benchmark::new(
@@ -223,7 +223,7 @@ static STATIC_FRAME: Benchmark = Benchmark::new(
         max_dep_date: "2025-08-09",
         python_version: PythonVersion::PY311,
     },
-    950,
+    900,
 );
 
 #[track_caller]

crates/ruff_graph/src/resolver.rs

@@ -1,5 +1,5 @@
 use ruff_db::files::FilePath;
-use ty_python_semantic::{ModuleName, resolve_module_old, resolve_real_module_old};
+use ty_python_semantic::{ModuleName, resolve_module, resolve_real_module};
 
 use crate::ModuleDb;
 use crate::collector::CollectedImport;
@@ -70,13 +70,13 @@ impl<'a> Resolver<'a> {
 
     /// Resolves a module name to a module.
     pub(crate) fn resolve_module(&self, module_name: &ModuleName) -> Option<&'a FilePath> {
-        let module = resolve_module_old(self.db, module_name)?;
+        let module = resolve_module(self.db, module_name)?;
         Some(module.file(self.db)?.path(self.db))
     }
 
     /// Resolves a module name to a module (stubs not allowed).
     fn resolve_real_module(&self, module_name: &ModuleName) -> Option<&'a FilePath> {
-        let module = resolve_real_module_old(self.db, module_name)?;
+        let module = resolve_real_module(self.db, module_name)?;
         Some(module.file(self.db)?.path(self.db))
     }
 }

crates/ruff_linter/Cargo.toml

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

crates/ruff_linter/resources/test/fixtures/flake8_bandit/S310.py

@@ -45,22 +45,3 @@ urllib.request.urlopen(urllib.request.Request(url))
 # https://github.com/astral-sh/ruff/issues/15522
 map(urllib.request.urlopen, [])
 foo = urllib.request.urlopen
-
-# https://github.com/astral-sh/ruff/issues/21462
-path = "https://example.com/data.csv"
-urllib.request.urlretrieve(path, "data.csv")
-url = "https://example.com/api"
-urllib.request.Request(url)
-
-# Test resolved f-strings and concatenated string literals
-fstring_url = f"https://example.com/data.csv"
-urllib.request.urlopen(fstring_url)
-urllib.request.Request(fstring_url)
-
-concatenated_url = "https://" + "example.com/data.csv"
-urllib.request.urlopen(concatenated_url)
-urllib.request.Request(concatenated_url)
-
-nested_concatenated = "http://" + "example.com" + "/data.csv"
-urllib.request.urlopen(nested_concatenated)
-urllib.request.Request(nested_concatenated)

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

@@ -1,70 +0,0 @@
-import abc
-import typing
-
-
-class User:  # Test normal class properties
-    @property
-    def name(self):  # ERROR: No return
-        f"{self.first_name} {self.last_name}"
-
-    @property
-    def age(self):  # OK: Returning something
-        return 100
-
-    def method(self):  # OK: Not a property
-        x = 1
-
-    @property
-    def nested(self):  # ERROR: Property itself doesn't return
-        def inner():
-            return 0
-
-    @property
-    def stub(self): ...  # OK: A stub; doesn't return anything
-
-
-class UserMeta(metaclass=abc.ABCMeta):  # Test properies inside of an ABC class
-    @property
-    @abc.abstractmethod
-    def abstr_prop1(self): ...  # OK: Abstract methods doesn't need to return anything
-
-    @property
-    @abc.abstractmethod
-    def abstr_prop2(self):  # OK: Abstract methods doesn't need to return anything
-        """
-        A cool docstring
-        """
-
-    @property
-    def prop1(self):  # OK: Returning a value
-        return 1
-
-    @property
-    def prop2(self):  # ERROR: Not returning something (even when we are inside an ABC)
-        50
-
-    def method(self):  # OK: Not a property
-        x = 1
-
-
-def func():  # OK: Not a property
-    x = 1
-
-
-class Proto(typing.Protocol):  # Tests for a Protocol class
-    @property
-    def prop1(self) -> int: ...  # OK: A stub property
-
-
-class File:  # Extra tests for things like yield/yield from/raise
-    @property
-    def stream1(self):  # OK: Yields something
-        yield
-
-    @property
-    def stream2(self):  # OK: Yields from something
-        yield from self.stream1
-
-    @property
-    def children(self):  # OK: Raises
-        raise ValueError("File does not have children")

crates/ruff_linter/resources/test/project/README.md

@@ -17,7 +17,7 @@ crates/ruff_linter/resources/test/project/examples/docs/docs/file.py:8:5: F841 [
 crates/ruff_linter/resources/test/project/project/file.py:1:8: F401 [*] `os` imported but unused
 crates/ruff_linter/resources/test/project/project/import_file.py:1:1: I001 [*] Import block is un-sorted or un-formatted
 Found 7 errors.
-[*] 7 potentially fixable with the `--fix` option.
+[*] 7 potentially fixable with the --fix option.
 ```
 
 Running from the project directory itself should exhibit the same behavior:
@@ -32,7 +32,7 @@ examples/docs/docs/file.py:8:5: F841 [*] Local variable `x` is assigned to but n
 project/file.py:1:8: F401 [*] `os` imported but unused
 project/import_file.py:1:1: I001 [*] Import block is un-sorted or un-formatted
 Found 7 errors.
-[*] 7 potentially fixable with the `--fix` option.
+[*] 7 potentially fixable with the --fix option.
 ```
 
 Running from the sub-package directory should exhibit the same behavior, but omit the top-level
@@ -43,7 +43,7 @@ files:
 docs/file.py:1:1: I001 [*] Import block is un-sorted or un-formatted
 docs/file.py:8:5: F841 [*] Local variable `x` is assigned to but never used
 Found 2 errors.
-[*] 2 potentially fixable with the `--fix` option.
+[*] 2 potentially fixable with the --fix option.
 ```
 
 `--config` should force Ruff to use the specified `pyproject.toml` for all files, and resolve
@@ -61,7 +61,7 @@ crates/ruff_linter/resources/test/project/examples/docs/docs/file.py:4:27: F401
 crates/ruff_linter/resources/test/project/examples/excluded/script.py:1:8: F401 [*] `os` imported but unused
 crates/ruff_linter/resources/test/project/project/file.py:1:8: F401 [*] `os` imported but unused
 Found 9 errors.
-[*] 9 potentially fixable with the `--fix` option.
+[*] 9 potentially fixable with the --fix option.
 ```
 
 Running from a parent directory should "ignore" the `exclude` (hence, `concepts/file.py` gets
@@ -74,7 +74,7 @@ docs/docs/file.py:1:1: I001 [*] Import block is un-sorted or un-formatted
 docs/docs/file.py:8:5: F841 [*] Local variable `x` is assigned to but never used
 excluded/script.py:5:5: F841 [*] Local variable `x` is assigned to but never used
 Found 4 errors.
-[*] 4 potentially fixable with the `--fix` option.
+[*] 4 potentially fixable with the --fix option.
 ```
 
 Passing an excluded directory directly should report errors in the contained files:
@@ -83,7 +83,7 @@ Passing an excluded directory directly should report errors in the contained fil
 ∴ cargo run -p ruff -- check crates/ruff_linter/resources/test/project/examples/excluded/
 crates/ruff_linter/resources/test/project/examples/excluded/script.py:1:8: F401 [*] `os` imported but unused
 Found 1 error.
-[*] 1 potentially fixable with the `--fix` option.
+[*] 1 potentially fixable with the --fix option.
 ```
 
 Unless we `--force-exclude`:

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

@@ -347,9 +347,6 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
             if checker.is_rule_enabled(Rule::InvalidArgumentName) {
                 pep8_naming::rules::invalid_argument_name_function(checker, function_def);
             }
-            if checker.is_rule_enabled(Rule::PropertyWithoutReturn) {
-                ruff::rules::property_without_return(checker, function_def);
-            }
         }
         Stmt::Return(_) => {
             if checker.is_rule_enabled(Rule::ReturnInInit) {

crates/ruff_linter/src/codes.rs

@@ -1058,7 +1058,6 @@ pub fn code_to_rule(linter: Linter, code: &str) -> Option<(RuleGroup, Rule)> {
         (Ruff, "063") => rules::ruff::rules::AccessAnnotationsFromClassDict,
         (Ruff, "064") => rules::ruff::rules::NonOctalPermissions,
         (Ruff, "065") => rules::ruff::rules::LoggingEagerConversion,
-        (Ruff, "066") => rules::ruff::rules::PropertyWithoutReturn,
 
         (Ruff, "100") => rules::ruff::rules::UnusedNOQA,
         (Ruff, "101") => rules::ruff::rules::RedirectedNOQA,

crates/ruff_linter/src/preview.rs

@@ -279,10 +279,3 @@ pub(crate) const fn is_extended_snmp_api_path_detection_enabled(settings: &Linte
 pub(crate) const fn is_enumerate_for_loop_int_index_enabled(settings: &LinterSettings) -> bool {
     settings.preview.is_enabled()
 }
-
-// https://github.com/astral-sh/ruff/pull/21469
-pub(crate) const fn is_s310_resolve_string_literal_bindings_enabled(
-    settings: &LinterSettings,
-) -> bool {
-    settings.preview.is_enabled()
-}

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

@@ -10,11 +10,11 @@ mod tests {
     use anyhow::Result;
     use test_case::test_case;
 
+    use crate::assert_diagnostics;
     use crate::registry::Rule;
     use crate::settings::LinterSettings;
     use crate::settings::types::PreviewMode;
     use crate::test::test_path;
-    use crate::{assert_diagnostics, assert_diagnostics_diff};
 
     #[test_case(Rule::Assert, Path::new("S101.py"))]
     #[test_case(Rule::BadFilePermissions, Path::new("S103.py"))]
@@ -112,19 +112,14 @@ mod tests {
             rule_code.noqa_code(),
             path.to_string_lossy()
         );
-
-        assert_diagnostics_diff!(
-            snapshot,
+        let diagnostics = test_path(
             Path::new("flake8_bandit").join(path).as_path(),
-            &LinterSettings {
-                preview: PreviewMode::Disabled,
-                ..LinterSettings::for_rule(rule_code)
-            },
             &LinterSettings {
                 preview: PreviewMode::Enabled,
                 ..LinterSettings::for_rule(rule_code)
-            }
-        );
+            },
+        )?;
+        assert_diagnostics!(snapshot, diagnostics);
         Ok(())
     }
 

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

@@ -4,16 +4,11 @@
 use itertools::Either;
 use ruff_macros::{ViolationMetadata, derive_message_formats};
 use ruff_python_ast::{self as ast, Arguments, Decorator, Expr, ExprCall, Operator};
-use ruff_python_semantic::SemanticModel;
-use ruff_python_semantic::analyze::typing::find_binding_value;
 use ruff_text_size::{Ranged, TextRange};
 
 use crate::Violation;
 use crate::checkers::ast::Checker;
-use crate::preview::{
-    is_s310_resolve_string_literal_bindings_enabled, is_suspicious_function_reference_enabled,
-};
-use crate::settings::LinterSettings;
+use crate::preview::is_suspicious_function_reference_enabled;
 
 /// ## What it does
 /// Checks for calls to `pickle` functions or modules that wrap them.
@@ -1021,25 +1016,6 @@ fn suspicious_function(
             || has_prefix(chars.skip_while(|c| c.is_whitespace()), "https://")
     }
 
-    /// Resolves `expr` to its binding and checks if the resolved expression starts with an HTTP or HTTPS prefix.
-    fn expression_starts_with_http_prefix(
-        expr: &Expr,
-        semantic: &SemanticModel,
-        settings: &LinterSettings,
-    ) -> bool {
-        let resolved_expression = if is_s310_resolve_string_literal_bindings_enabled(settings)
-            && let Some(name_expr) = expr.as_name_expr()
-            && let Some(binding_id) = semantic.only_binding(name_expr)
-            && let Some(value) = find_binding_value(semantic.binding(binding_id), semantic)
-        {
-            value
-        } else {
-            expr
-        };
-
-        leading_chars(resolved_expression).is_some_and(has_http_prefix)
-    }
-
     /// Return the leading characters for an expression, if it's a string literal, f-string, or
     /// string concatenation.
     fn leading_chars(expr: &Expr) -> Option<impl Iterator<Item = char> + Clone + '_> {
@@ -1163,19 +1139,17 @@ fn suspicious_function(
         // URLOpen (`Request`)
         ["urllib", "request", "Request"] | ["six", "moves", "urllib", "request", "Request"] => {
             if let Some(arguments) = arguments {
-                // If the `url` argument is a string literal (including resolved bindings), allow `http` and `https` schemes.
+                // If the `url` argument is a string literal or an f-string, allow `http` and `https` schemes.
                 if arguments.args.iter().all(|arg| !arg.is_starred_expr())
                     && arguments
                         .keywords
                         .iter()
                         .all(|keyword| keyword.arg.is_some())
                 {
-                    if let Some(url_expr) = arguments.find_argument_value("url", 0)
-                        && expression_starts_with_http_prefix(
-                            url_expr,
-                            checker.semantic(),
-                            checker.settings(),
-                        )
+                    if arguments
+                        .find_argument_value("url", 0)
+                        .and_then(leading_chars)
+                        .is_some_and(has_http_prefix)
                     {
                         return;
                     }
@@ -1212,25 +1186,19 @@ fn suspicious_function(
                                     name.segments() == ["urllib", "request", "Request"]
                                 })
                             {
-                                if let Some(url_expr) = arguments.find_argument_value("url", 0)
-                                    && expression_starts_with_http_prefix(
-                                        url_expr,
-                                        checker.semantic(),
-                                        checker.settings(),
-                                    )
+                                if arguments
+                                    .find_argument_value("url", 0)
+                                    .and_then(leading_chars)
+                                    .is_some_and(has_http_prefix)
                                 {
                                     return;
                                 }
                             }
                         }
 
-                        // If the `url` argument is a string literal (including resolved bindings), allow `http` and `https` schemes.
+                        // If the `url` argument is a string literal, allow `http` and `https` schemes.
                         Some(expr) => {
-                            if expression_starts_with_http_prefix(
-                                expr,
-                                checker.semantic(),
-                                checker.settings(),
-                            ) {
+                            if leading_chars(expr).is_some_and(has_http_prefix) {
                                 return;
                             }
                         }

crates/ruff_linter/src/rules/flake8_bandit/snapshots/ruff_linter__rules__flake8_bandit__tests__S310_S310.py.snap

@@ -254,84 +254,3 @@ S310 Audit URL open for permitted schemes. Allowing use of `file:` or custom sch
 42 | urllib.request.urlopen(urllib.request.Request(url))
    |                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-
-S310 Audit URL open for permitted schemes. Allowing use of `file:` or custom schemes is often unexpected.
-  --> S310.py:51:1
-   |
-49 | # https://github.com/astral-sh/ruff/issues/21462
-50 | path = "https://example.com/data.csv"
-51 | urllib.request.urlretrieve(path, "data.csv")
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-52 | url = "https://example.com/api"
-53 | urllib.request.Request(url)
-   |
-
-S310 Audit URL open for permitted schemes. Allowing use of `file:` or custom schemes is often unexpected.
-  --> S310.py:53:1
-   |
-51 | urllib.request.urlretrieve(path, "data.csv")
-52 | url = "https://example.com/api"
-53 | urllib.request.Request(url)
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^
-54 |
-55 | # Test resolved f-strings and concatenated string literals
-   |
-
-S310 Audit URL open for permitted schemes. Allowing use of `file:` or custom schemes is often unexpected.
-  --> S310.py:57:1
-   |
-55 | # Test resolved f-strings and concatenated string literals
-56 | fstring_url = f"https://example.com/data.csv"
-57 | urllib.request.urlopen(fstring_url)
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-58 | urllib.request.Request(fstring_url)
-   |
-
-S310 Audit URL open for permitted schemes. Allowing use of `file:` or custom schemes is often unexpected.
-  --> S310.py:58:1
-   |
-56 | fstring_url = f"https://example.com/data.csv"
-57 | urllib.request.urlopen(fstring_url)
-58 | urllib.request.Request(fstring_url)
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-59 |
-60 | concatenated_url = "https://" + "example.com/data.csv"
-   |
-
-S310 Audit URL open for permitted schemes. Allowing use of `file:` or custom schemes is often unexpected.
-  --> S310.py:61:1
-   |
-60 | concatenated_url = "https://" + "example.com/data.csv"
-61 | urllib.request.urlopen(concatenated_url)
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-62 | urllib.request.Request(concatenated_url)
-   |
-
-S310 Audit URL open for permitted schemes. Allowing use of `file:` or custom schemes is often unexpected.
-  --> S310.py:62:1
-   |
-60 | concatenated_url = "https://" + "example.com/data.csv"
-61 | urllib.request.urlopen(concatenated_url)
-62 | urllib.request.Request(concatenated_url)
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-63 |
-64 | nested_concatenated = "http://" + "example.com" + "/data.csv"
-   |
-
-S310 Audit URL open for permitted schemes. Allowing use of `file:` or custom schemes is often unexpected.
-  --> S310.py:65:1
-   |
-64 | nested_concatenated = "http://" + "example.com" + "/data.csv"
-65 | urllib.request.urlopen(nested_concatenated)
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-66 | urllib.request.Request(nested_concatenated)
-   |
-
-S310 Audit URL open for permitted schemes. Allowing use of `file:` or custom schemes is often unexpected.
-  --> S310.py:66:1
-   |
-64 | nested_concatenated = "http://" + "example.com" + "/data.csv"
-65 | urllib.request.urlopen(nested_concatenated)
-66 | urllib.request.Request(nested_concatenated)
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   |

crates/ruff_linter/src/rules/flake8_bandit/snapshots/ruff_linter__rules__flake8_bandit__tests__preview__S301_S301.py.snap

@@ -1,15 +1,15 @@
 ---
 source: crates/ruff_linter/src/rules/flake8_bandit/mod.rs
 ---
---- Linter settings ---
--linter.preview = disabled
-+linter.preview = enabled
+S301 `pickle` and modules that wrap it can be unsafe when used to deserialize untrusted data, possible security issue
+ --> S301.py:3:1
+  |
+1 | import pickle
+2 |
+3 | pickle.loads()
+  | ^^^^^^^^^^^^^^
+  |
 
---- Summary ---
-Removed: 0
-Added: 2
-
---- Added ---
 S301 `pickle` and modules that wrap it can be unsafe when used to deserialize untrusted data, possible security issue
  --> S301.py:7:5
   |
@@ -19,7 +19,6 @@ S301 `pickle` and modules that wrap it can be unsafe when used to deserialize un
 8 | foo = pickle.load
   |
 
-
 S301 `pickle` and modules that wrap it can be unsafe when used to deserialize untrusted data, possible security issue
  --> S301.py:8:7
   |

crates/ruff_linter/src/rules/flake8_bandit/snapshots/ruff_linter__rules__flake8_bandit__tests__preview__S307_S307.py.snap

@@ -1,15 +1,24 @@
 ---
 source: crates/ruff_linter/src/rules/flake8_bandit/mod.rs
 ---
---- Linter settings ---
--linter.preview = disabled
-+linter.preview = enabled
+S307 Use of possibly insecure function; consider using `ast.literal_eval`
+ --> S307.py:3:7
+  |
+1 | import os
+2 |
+3 | print(eval("1+1"))  # S307
+  |       ^^^^^^^^^^^
+4 | print(eval("os.getcwd()"))  # S307
+  |
 
---- Summary ---
-Removed: 0
-Added: 2
+S307 Use of possibly insecure function; consider using `ast.literal_eval`
+ --> S307.py:4:7
+  |
+3 | print(eval("1+1"))  # S307
+4 | print(eval("os.getcwd()"))  # S307
+  |       ^^^^^^^^^^^^^^^^^^^
+  |
 
---- Added ---
 S307 Use of possibly insecure function; consider using `ast.literal_eval`
   --> S307.py:16:5
    |
@@ -19,7 +28,6 @@ S307 Use of possibly insecure function; consider using `ast.literal_eval`
 17 | foo = eval
    |
 
-
 S307 Use of possibly insecure function; consider using `ast.literal_eval`
   --> S307.py:17:7
    |

crates/ruff_linter/src/rules/flake8_bandit/snapshots/ruff_linter__rules__flake8_bandit__tests__preview__S308_S308.py.snap

@@ -1,37 +1,60 @@
 ---
 source: crates/ruff_linter/src/rules/flake8_bandit/mod.rs
 ---
---- Linter settings ---
--linter.preview = disabled
-+linter.preview = enabled
-
---- Summary ---
-Removed: 2
-Added: 4
-
---- Removed ---
 S308 Use of `mark_safe` may expose cross-site scripting vulnerabilities
-  --> S308.py:16:1
-   |
-16 | @mark_safe
-   | ^^^^^^^^^^
-17 | def some_func():
-18 |     return '<script>alert("evil!")</script>'
-   |
-
+ --> S308.py:6:5
+  |
+4 | def bad_func():
+5 |     inject = "harmful_input"
+6 |     mark_safe(inject)
+  |     ^^^^^^^^^^^^^^^^^
+7 |     mark_safe("I will add" + inject + "to my string")
+8 |     mark_safe("I will add %s to my string" % inject)
+  |
 
 S308 Use of `mark_safe` may expose cross-site scripting vulnerabilities
-  --> S308.py:36:1
+ --> S308.py:7:5
+  |
+5 |     inject = "harmful_input"
+6 |     mark_safe(inject)
+7 |     mark_safe("I will add" + inject + "to my string")
+  |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+8 |     mark_safe("I will add %s to my string" % inject)
+9 |     mark_safe("I will add {} to my string".format(inject))
+  |
+
+S308 Use of `mark_safe` may expose cross-site scripting vulnerabilities
+  --> S308.py:8:5
    |
-36 | @mark_safe
-   | ^^^^^^^^^^
-37 | def some_func():
-38 |     return '<script>alert("evil!")</script>'
+ 6 |     mark_safe(inject)
+ 7 |     mark_safe("I will add" + inject + "to my string")
+ 8 |     mark_safe("I will add %s to my string" % inject)
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ 9 |     mark_safe("I will add {} to my string".format(inject))
+10 |     mark_safe(f"I will add {inject} to my string")
    |
 
+S308 Use of `mark_safe` may expose cross-site scripting vulnerabilities
+  --> S308.py:9:5
+   |
+ 7 |     mark_safe("I will add" + inject + "to my string")
+ 8 |     mark_safe("I will add %s to my string" % inject)
+ 9 |     mark_safe("I will add {} to my string".format(inject))
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+10 |     mark_safe(f"I will add {inject} to my string")
+   |
 
+S308 Use of `mark_safe` may expose cross-site scripting vulnerabilities
+  --> S308.py:10:5
+   |
+ 8 |     mark_safe("I will add %s to my string" % inject)
+ 9 |     mark_safe("I will add {} to my string".format(inject))
+10 |     mark_safe(f"I will add {inject} to my string")
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+11 |
+12 | def good_func():
+   |
 
---- Added ---
 S308 Use of `mark_safe` may expose cross-site scripting vulnerabilities
   --> S308.py:16:2
    |
@@ -41,6 +64,59 @@ S308 Use of `mark_safe` may expose cross-site scripting vulnerabilities
 18 |     return '<script>alert("evil!")</script>'
    |
 
+S308 Use of `mark_safe` may expose cross-site scripting vulnerabilities
+  --> S308.py:26:5
+   |
+24 | def bad_func():
+25 |     inject = "harmful_input"
+26 |     mark_safe(inject)
+   |     ^^^^^^^^^^^^^^^^^
+27 |     mark_safe("I will add" + inject + "to my string")
+28 |     mark_safe("I will add %s to my string" % inject)
+   |
+
+S308 Use of `mark_safe` may expose cross-site scripting vulnerabilities
+  --> S308.py:27:5
+   |
+25 |     inject = "harmful_input"
+26 |     mark_safe(inject)
+27 |     mark_safe("I will add" + inject + "to my string")
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+28 |     mark_safe("I will add %s to my string" % inject)
+29 |     mark_safe("I will add {} to my string".format(inject))
+   |
+
+S308 Use of `mark_safe` may expose cross-site scripting vulnerabilities
+  --> S308.py:28:5
+   |
+26 |     mark_safe(inject)
+27 |     mark_safe("I will add" + inject + "to my string")
+28 |     mark_safe("I will add %s to my string" % inject)
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+29 |     mark_safe("I will add {} to my string".format(inject))
+30 |     mark_safe(f"I will add {inject} to my string")
+   |
+
+S308 Use of `mark_safe` may expose cross-site scripting vulnerabilities
+  --> S308.py:29:5
+   |
+27 |     mark_safe("I will add" + inject + "to my string")
+28 |     mark_safe("I will add %s to my string" % inject)
+29 |     mark_safe("I will add {} to my string".format(inject))
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+30 |     mark_safe(f"I will add {inject} to my string")
+   |
+
+S308 Use of `mark_safe` may expose cross-site scripting vulnerabilities
+  --> S308.py:30:5
+   |
+28 |     mark_safe("I will add %s to my string" % inject)
+29 |     mark_safe("I will add {} to my string".format(inject))
+30 |     mark_safe(f"I will add {inject} to my string")
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+31 |
+32 | def good_func():
+   |
 
 S308 Use of `mark_safe` may expose cross-site scripting vulnerabilities
   --> S308.py:36:2
@@ -51,7 +127,6 @@ S308 Use of `mark_safe` may expose cross-site scripting vulnerabilities
 38 |     return '<script>alert("evil!")</script>'
    |
 
-
 S308 Use of `mark_safe` may expose cross-site scripting vulnerabilities
   --> S308.py:42:5
    |
@@ -61,7 +136,6 @@ S308 Use of `mark_safe` may expose cross-site scripting vulnerabilities
 43 | foo = mark_safe
    |
 
-
 S308 Use of `mark_safe` may expose cross-site scripting vulnerabilities
   --> S308.py:43:7
    |

crates/ruff_linter/src/rules/flake8_bandit/snapshots/ruff_linter__rules__flake8_bandit__tests__preview__S310_S310.py.snap

@@ -1,106 +1,260 @@
 ---
 source: crates/ruff_linter/src/rules/flake8_bandit/mod.rs
 ---
---- Linter settings ---
--linter.preview = disabled
-+linter.preview = enabled
-
---- Summary ---
-Removed: 8
-Added: 2
-
---- Removed ---
 S310 Audit URL open for permitted schemes. Allowing use of `file:` or custom schemes is often unexpected.
-  --> S310.py:51:1
-   |
-49 | # https://github.com/astral-sh/ruff/issues/21462
-50 | path = "https://example.com/data.csv"
-51 | urllib.request.urlretrieve(path, "data.csv")
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-52 | url = "https://example.com/api"
-53 | urllib.request.Request(url)
-   |
-
+ --> S310.py:6:1
+  |
+4 | urllib.request.urlopen(url=f'http://www.google.com')
+5 | urllib.request.urlopen(url='http://' + 'www' + '.google.com')
+6 | urllib.request.urlopen(url='http://www.google.com', **kwargs)
+  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+7 | urllib.request.urlopen(url=f'http://www.google.com', **kwargs)
+8 | urllib.request.urlopen('http://www.google.com')
+  |
 
 S310 Audit URL open for permitted schemes. Allowing use of `file:` or custom schemes is often unexpected.
-  --> S310.py:53:1
+ --> S310.py:7:1
+  |
+5 | urllib.request.urlopen(url='http://' + 'www' + '.google.com')
+6 | urllib.request.urlopen(url='http://www.google.com', **kwargs)
+7 | urllib.request.urlopen(url=f'http://www.google.com', **kwargs)
+  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+8 | urllib.request.urlopen('http://www.google.com')
+9 | urllib.request.urlopen(f'http://www.google.com')
+  |
+
+S310 Audit URL open for permitted schemes. Allowing use of `file:` or custom schemes is often unexpected.
+  --> S310.py:10:1
    |
-51 | urllib.request.urlretrieve(path, "data.csv")
-52 | url = "https://example.com/api"
-53 | urllib.request.Request(url)
+ 8 | urllib.request.urlopen('http://www.google.com')
+ 9 | urllib.request.urlopen(f'http://www.google.com')
+10 | urllib.request.urlopen('file:///foo/bar/baz')
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+11 | urllib.request.urlopen(url)
+   |
+
+S310 Audit URL open for permitted schemes. Allowing use of `file:` or custom schemes is often unexpected.
+  --> S310.py:11:1
+   |
+ 9 | urllib.request.urlopen(f'http://www.google.com')
+10 | urllib.request.urlopen('file:///foo/bar/baz')
+11 | urllib.request.urlopen(url)
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^
-54 |
-55 | # Test resolved f-strings and concatenated string literals
+12 |
+13 | urllib.request.Request(url='http://www.google.com')
    |
 
-
 S310 Audit URL open for permitted schemes. Allowing use of `file:` or custom schemes is often unexpected.
-  --> S310.py:57:1
+  --> S310.py:16:1
    |
-55 | # Test resolved f-strings and concatenated string literals
-56 | fstring_url = f"https://example.com/data.csv"
-57 | urllib.request.urlopen(fstring_url)
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-58 | urllib.request.Request(fstring_url)
+14 | urllib.request.Request(url=f'http://www.google.com')
+15 | urllib.request.Request(url='http://' + 'www' + '.google.com')
+16 | urllib.request.Request(url='http://www.google.com', **kwargs)
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+17 | urllib.request.Request(url=f'http://www.google.com', **kwargs)
+18 | urllib.request.Request('http://www.google.com')
    |
 
-
 S310 Audit URL open for permitted schemes. Allowing use of `file:` or custom schemes is often unexpected.
-  --> S310.py:58:1
+  --> S310.py:17:1
    |
-56 | fstring_url = f"https://example.com/data.csv"
-57 | urllib.request.urlopen(fstring_url)
-58 | urllib.request.Request(fstring_url)
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-59 |
-60 | concatenated_url = "https://" + "example.com/data.csv"
+15 | urllib.request.Request(url='http://' + 'www' + '.google.com')
+16 | urllib.request.Request(url='http://www.google.com', **kwargs)
+17 | urllib.request.Request(url=f'http://www.google.com', **kwargs)
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+18 | urllib.request.Request('http://www.google.com')
+19 | urllib.request.Request(f'http://www.google.com')
    |
 
-
 S310 Audit URL open for permitted schemes. Allowing use of `file:` or custom schemes is often unexpected.
-  --> S310.py:61:1
+  --> S310.py:20:1
    |
-60 | concatenated_url = "https://" + "example.com/data.csv"
-61 | urllib.request.urlopen(concatenated_url)
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-62 | urllib.request.Request(concatenated_url)
+18 | urllib.request.Request('http://www.google.com')
+19 | urllib.request.Request(f'http://www.google.com')
+20 | urllib.request.Request('file:///foo/bar/baz')
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+21 | urllib.request.Request(url)
    |
 
-
 S310 Audit URL open for permitted schemes. Allowing use of `file:` or custom schemes is often unexpected.
-  --> S310.py:62:1
+  --> S310.py:21:1
    |
-60 | concatenated_url = "https://" + "example.com/data.csv"
-61 | urllib.request.urlopen(concatenated_url)
-62 | urllib.request.Request(concatenated_url)
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-63 |
-64 | nested_concatenated = "http://" + "example.com" + "/data.csv"
+19 | urllib.request.Request(f'http://www.google.com')
+20 | urllib.request.Request('file:///foo/bar/baz')
+21 | urllib.request.Request(url)
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+22 |
+23 | urllib.request.URLopener().open(fullurl='http://www.google.com')
    |
 
-
 S310 Audit URL open for permitted schemes. Allowing use of `file:` or custom schemes is often unexpected.
-  --> S310.py:65:1
+  --> S310.py:23:1
    |
-64 | nested_concatenated = "http://" + "example.com" + "/data.csv"
-65 | urllib.request.urlopen(nested_concatenated)
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-66 | urllib.request.Request(nested_concatenated)
+21 | urllib.request.Request(url)
+22 |
+23 | urllib.request.URLopener().open(fullurl='http://www.google.com')
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^
+24 | urllib.request.URLopener().open(fullurl=f'http://www.google.com')
+25 | urllib.request.URLopener().open(fullurl='http://' + 'www' + '.google.com')
    |
 
-
 S310 Audit URL open for permitted schemes. Allowing use of `file:` or custom schemes is often unexpected.
-  --> S310.py:66:1
+  --> S310.py:24:1
    |
-64 | nested_concatenated = "http://" + "example.com" + "/data.csv"
-65 | urllib.request.urlopen(nested_concatenated)
-66 | urllib.request.Request(nested_concatenated)
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+23 | urllib.request.URLopener().open(fullurl='http://www.google.com')
+24 | urllib.request.URLopener().open(fullurl=f'http://www.google.com')
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^
+25 | urllib.request.URLopener().open(fullurl='http://' + 'www' + '.google.com')
+26 | urllib.request.URLopener().open(fullurl='http://www.google.com', **kwargs)
    |
 
+S310 Audit URL open for permitted schemes. Allowing use of `file:` or custom schemes is often unexpected.
+  --> S310.py:25:1
+   |
+23 | urllib.request.URLopener().open(fullurl='http://www.google.com')
+24 | urllib.request.URLopener().open(fullurl=f'http://www.google.com')
+25 | urllib.request.URLopener().open(fullurl='http://' + 'www' + '.google.com')
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^
+26 | urllib.request.URLopener().open(fullurl='http://www.google.com', **kwargs)
+27 | urllib.request.URLopener().open(fullurl=f'http://www.google.com', **kwargs)
+   |
 
+S310 Audit URL open for permitted schemes. Allowing use of `file:` or custom schemes is often unexpected.
+  --> S310.py:26:1
+   |
+24 | urllib.request.URLopener().open(fullurl=f'http://www.google.com')
+25 | urllib.request.URLopener().open(fullurl='http://' + 'www' + '.google.com')
+26 | urllib.request.URLopener().open(fullurl='http://www.google.com', **kwargs)
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^
+27 | urllib.request.URLopener().open(fullurl=f'http://www.google.com', **kwargs)
+28 | urllib.request.URLopener().open('http://www.google.com')
+   |
+
+S310 Audit URL open for permitted schemes. Allowing use of `file:` or custom schemes is often unexpected.
+  --> S310.py:27:1
+   |
+25 | urllib.request.URLopener().open(fullurl='http://' + 'www' + '.google.com')
+26 | urllib.request.URLopener().open(fullurl='http://www.google.com', **kwargs)
+27 | urllib.request.URLopener().open(fullurl=f'http://www.google.com', **kwargs)
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^
+28 | urllib.request.URLopener().open('http://www.google.com')
+29 | urllib.request.URLopener().open(f'http://www.google.com')
+   |
+
+S310 Audit URL open for permitted schemes. Allowing use of `file:` or custom schemes is often unexpected.
+  --> S310.py:28:1
+   |
+26 | urllib.request.URLopener().open(fullurl='http://www.google.com', **kwargs)
+27 | urllib.request.URLopener().open(fullurl=f'http://www.google.com', **kwargs)
+28 | urllib.request.URLopener().open('http://www.google.com')
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^
+29 | urllib.request.URLopener().open(f'http://www.google.com')
+30 | urllib.request.URLopener().open('http://' + 'www' + '.google.com')
+   |
+
+S310 Audit URL open for permitted schemes. Allowing use of `file:` or custom schemes is often unexpected.
+  --> S310.py:29:1
+   |
+27 | urllib.request.URLopener().open(fullurl=f'http://www.google.com', **kwargs)
+28 | urllib.request.URLopener().open('http://www.google.com')
+29 | urllib.request.URLopener().open(f'http://www.google.com')
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^
+30 | urllib.request.URLopener().open('http://' + 'www' + '.google.com')
+31 | urllib.request.URLopener().open('file:///foo/bar/baz')
+   |
+
+S310 Audit URL open for permitted schemes. Allowing use of `file:` or custom schemes is often unexpected.
+  --> S310.py:30:1
+   |
+28 | urllib.request.URLopener().open('http://www.google.com')
+29 | urllib.request.URLopener().open(f'http://www.google.com')
+30 | urllib.request.URLopener().open('http://' + 'www' + '.google.com')
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^
+31 | urllib.request.URLopener().open('file:///foo/bar/baz')
+32 | urllib.request.URLopener().open(url)
+   |
+
+S310 Audit URL open for permitted schemes. Allowing use of `file:` or custom schemes is often unexpected.
+  --> S310.py:31:1
+   |
+29 | urllib.request.URLopener().open(f'http://www.google.com')
+30 | urllib.request.URLopener().open('http://' + 'www' + '.google.com')
+31 | urllib.request.URLopener().open('file:///foo/bar/baz')
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^
+32 | urllib.request.URLopener().open(url)
+   |
+
+S310 Audit URL open for permitted schemes. Allowing use of `file:` or custom schemes is often unexpected.
+  --> S310.py:32:1
+   |
+30 | urllib.request.URLopener().open('http://' + 'www' + '.google.com')
+31 | urllib.request.URLopener().open('file:///foo/bar/baz')
+32 | urllib.request.URLopener().open(url)
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^
+33 |
+34 | urllib.request.urlopen(url=urllib.request.Request('http://www.google.com'))
+   |
+
+S310 Audit URL open for permitted schemes. Allowing use of `file:` or custom schemes is often unexpected.
+  --> S310.py:37:1
+   |
+35 | urllib.request.urlopen(url=urllib.request.Request(f'http://www.google.com'))
+36 | urllib.request.urlopen(url=urllib.request.Request('http://' + 'www' + '.google.com'))
+37 | urllib.request.urlopen(url=urllib.request.Request('http://www.google.com'), **kwargs)
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+38 | urllib.request.urlopen(url=urllib.request.Request(f'http://www.google.com'), **kwargs)
+39 | urllib.request.urlopen(urllib.request.Request('http://www.google.com'))
+   |
+
+S310 Audit URL open for permitted schemes. Allowing use of `file:` or custom schemes is often unexpected.
+  --> S310.py:38:1
+   |
+36 | urllib.request.urlopen(url=urllib.request.Request('http://' + 'www' + '.google.com'))
+37 | urllib.request.urlopen(url=urllib.request.Request('http://www.google.com'), **kwargs)
+38 | urllib.request.urlopen(url=urllib.request.Request(f'http://www.google.com'), **kwargs)
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+39 | urllib.request.urlopen(urllib.request.Request('http://www.google.com'))
+40 | urllib.request.urlopen(urllib.request.Request(f'http://www.google.com'))
+   |
+
+S310 Audit URL open for permitted schemes. Allowing use of `file:` or custom schemes is often unexpected.
+  --> S310.py:41:1
+   |
+39 | urllib.request.urlopen(urllib.request.Request('http://www.google.com'))
+40 | urllib.request.urlopen(urllib.request.Request(f'http://www.google.com'))
+41 | urllib.request.urlopen(urllib.request.Request('file:///foo/bar/baz'))
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+42 | urllib.request.urlopen(urllib.request.Request(url))
+   |
+
+S310 Audit URL open for permitted schemes. Allowing use of `file:` or custom schemes is often unexpected.
+  --> S310.py:41:24
+   |
+39 | urllib.request.urlopen(urllib.request.Request('http://www.google.com'))
+40 | urllib.request.urlopen(urllib.request.Request(f'http://www.google.com'))
+41 | urllib.request.urlopen(urllib.request.Request('file:///foo/bar/baz'))
+   |                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+42 | urllib.request.urlopen(urllib.request.Request(url))
+   |
+
+S310 Audit URL open for permitted schemes. Allowing use of `file:` or custom schemes is often unexpected.
+  --> S310.py:42:1
+   |
+40 | urllib.request.urlopen(urllib.request.Request(f'http://www.google.com'))
+41 | urllib.request.urlopen(urllib.request.Request('file:///foo/bar/baz'))
+42 | urllib.request.urlopen(urllib.request.Request(url))
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+
+S310 Audit URL open for permitted schemes. Allowing use of `file:` or custom schemes is often unexpected.
+  --> S310.py:42:24
+   |
+40 | urllib.request.urlopen(urllib.request.Request(f'http://www.google.com'))
+41 | urllib.request.urlopen(urllib.request.Request('file:///foo/bar/baz'))
+42 | urllib.request.urlopen(urllib.request.Request(url))
+   |                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
 
---- Added ---
 S310 Audit URL open for permitted schemes. Allowing use of `file:` or custom schemes is often unexpected.
   --> S310.py:46:5
    |
@@ -110,7 +264,6 @@ S310 Audit URL open for permitted schemes. Allowing use of `file:` or custom sch
 47 | foo = urllib.request.urlopen
    |
 
-
 S310 Audit URL open for permitted schemes. Allowing use of `file:` or custom schemes is often unexpected.
   --> S310.py:47:7
    |
@@ -118,6 +271,4 @@ S310 Audit URL open for permitted schemes. Allowing use of `file:` or custom sch
 46 | map(urllib.request.urlopen, [])
 47 | foo = urllib.request.urlopen
    |       ^^^^^^^^^^^^^^^^^^^^^^
-48 |
-49 | # https://github.com/astral-sh/ruff/issues/21462
    |

crates/ruff_linter/src/rules/flake8_bandit/snapshots/ruff_linter__rules__flake8_bandit__tests__preview__S311_S311.py.snap

@@ -1,15 +1,103 @@
 ---
 source: crates/ruff_linter/src/rules/flake8_bandit/mod.rs
 ---
---- Linter settings ---
--linter.preview = disabled
-+linter.preview = enabled
+S311 Standard pseudo-random generators are not suitable for cryptographic purposes
+  --> S311.py:10:1
+   |
+ 9 | # Errors
+10 | random.Random()
+   | ^^^^^^^^^^^^^^^
+11 | random.random()
+12 | random.randrange()
+   |
 
---- Summary ---
-Removed: 0
-Added: 2
+S311 Standard pseudo-random generators are not suitable for cryptographic purposes
+  --> S311.py:11:1
+   |
+ 9 | # Errors
+10 | random.Random()
+11 | random.random()
+   | ^^^^^^^^^^^^^^^
+12 | random.randrange()
+13 | random.randint()
+   |
+
+S311 Standard pseudo-random generators are not suitable for cryptographic purposes
+  --> S311.py:12:1
+   |
+10 | random.Random()
+11 | random.random()
+12 | random.randrange()
+   | ^^^^^^^^^^^^^^^^^^
+13 | random.randint()
+14 | random.choice()
+   |
+
+S311 Standard pseudo-random generators are not suitable for cryptographic purposes
+  --> S311.py:13:1
+   |
+11 | random.random()
+12 | random.randrange()
+13 | random.randint()
+   | ^^^^^^^^^^^^^^^^
+14 | random.choice()
+15 | random.choices()
+   |
+
+S311 Standard pseudo-random generators are not suitable for cryptographic purposes
+  --> S311.py:14:1
+   |
+12 | random.randrange()
+13 | random.randint()
+14 | random.choice()
+   | ^^^^^^^^^^^^^^^
+15 | random.choices()
+16 | random.uniform()
+   |
+
+S311 Standard pseudo-random generators are not suitable for cryptographic purposes
+  --> S311.py:15:1
+   |
+13 | random.randint()
+14 | random.choice()
+15 | random.choices()
+   | ^^^^^^^^^^^^^^^^
+16 | random.uniform()
+17 | random.triangular()
+   |
+
+S311 Standard pseudo-random generators are not suitable for cryptographic purposes
+  --> S311.py:16:1
+   |
+14 | random.choice()
+15 | random.choices()
+16 | random.uniform()
+   | ^^^^^^^^^^^^^^^^
+17 | random.triangular()
+18 | random.randbytes()
+   |
+
+S311 Standard pseudo-random generators are not suitable for cryptographic purposes
+  --> S311.py:17:1
+   |
+15 | random.choices()
+16 | random.uniform()
+17 | random.triangular()
+   | ^^^^^^^^^^^^^^^^^^^
+18 | random.randbytes()
+   |
+
+S311 Standard pseudo-random generators are not suitable for cryptographic purposes
+  --> S311.py:18:1
+   |
+16 | random.uniform()
+17 | random.triangular()
+18 | random.randbytes()
+   | ^^^^^^^^^^^^^^^^^^
+19 |
+20 | # Unrelated
+   |
 
---- Added ---
 S311 Standard pseudo-random generators are not suitable for cryptographic purposes
   --> S311.py:26:5
    |
@@ -19,7 +107,6 @@ S311 Standard pseudo-random generators are not suitable for cryptographic purpos
 27 | foo = random.randrange
    |
 
-
 S311 Standard pseudo-random generators are not suitable for cryptographic purposes
   --> S311.py:27:7
    |

crates/ruff_linter/src/rules/flake8_bandit/snapshots/ruff_linter__rules__flake8_bandit__tests__preview__S312_S312.py.snap

@@ -1,15 +1,15 @@
 ---
 source: crates/ruff_linter/src/rules/flake8_bandit/mod.rs
 ---
---- Linter settings ---
--linter.preview = disabled
-+linter.preview = enabled
+S312 Telnet is considered insecure. Use SSH or some other encrypted protocol.
+ --> S312.py:3:1
+  |
+1 | from telnetlib import Telnet
+2 |
+3 | Telnet("localhost", 23)
+  | ^^^^^^^^^^^^^^^^^^^^^^^
+  |
 
---- Summary ---
-Removed: 0
-Added: 3
-
---- Added ---
 S312 Telnet is considered insecure. Use SSH or some other encrypted protocol.
  --> S312.py:7:5
   |
@@ -19,7 +19,6 @@ S312 Telnet is considered insecure. Use SSH or some other encrypted protocol.
 8 | foo = Telnet
   |
 
-
 S312 Telnet is considered insecure. Use SSH or some other encrypted protocol.
   --> S312.py:8:7
    |
@@ -31,7 +30,6 @@ S312 Telnet is considered insecure. Use SSH or some other encrypted protocol.
 10 | import telnetlib
    |
 
-
 S312 Telnet is considered insecure. Use SSH or some other encrypted protocol.
   --> S312.py:11:5
    |
@@ -41,3 +39,13 @@ S312 Telnet is considered insecure. Use SSH or some other encrypted protocol.
 12 |
 13 | from typing import Annotated
    |
+
+S312 Telnet is considered insecure. Use SSH or some other encrypted protocol.
+  --> S312.py:14:24
+   |
+13 | from typing import Annotated
+14 | foo: Annotated[Telnet, telnetlib.Telnet()]
+   |                        ^^^^^^^^^^^^^^^^^^
+15 |
+16 | def _() -> Telnet: ...
+   |

crates/ruff_linter/src/rules/flake8_bandit/snapshots/ruff_linter__rules__flake8_bandit__tests__preview__S508_S508.py.snap

@@ -1,15 +1,26 @@
 ---
 source: crates/ruff_linter/src/rules/flake8_bandit/mod.rs
 ---
---- Linter settings ---
--linter.preview = disabled
-+linter.preview = enabled
+S508 The use of SNMPv1 and SNMPv2 is insecure. Use SNMPv3 if able.
+ --> S508.py:3:25
+  |
+1 | from pysnmp.hlapi import CommunityData
+2 |
+3 | CommunityData("public", mpModel=0)  # S508
+  |                         ^^^^^^^^^
+4 | CommunityData("public", mpModel=1)  # S508
+  |
 
---- Summary ---
-Removed: 0
-Added: 8
+S508 The use of SNMPv1 and SNMPv2 is insecure. Use SNMPv3 if able.
+ --> S508.py:4:25
+  |
+3 | CommunityData("public", mpModel=0)  # S508
+4 | CommunityData("public", mpModel=1)  # S508
+  |                         ^^^^^^^^^
+5 |
+6 | CommunityData("public", mpModel=2)  # OK
+  |
 
---- Added ---
 S508 The use of SNMPv1 and SNMPv2 is insecure. Use SNMPv3 if able.
   --> S508.py:18:46
    |
@@ -21,7 +32,6 @@ S508 The use of SNMPv1 and SNMPv2 is insecure. Use SNMPv3 if able.
 20 | pysnmp.hlapi.v1arch.asyncio.CommunityData("public", mpModel=0)  # S508
    |
 
-
 S508 The use of SNMPv1 and SNMPv2 is insecure. Use SNMPv3 if able.
   --> S508.py:19:58
    |
@@ -32,7 +42,6 @@ S508 The use of SNMPv1 and SNMPv2 is insecure. Use SNMPv3 if able.
 21 | pysnmp.hlapi.v1arch.CommunityData("public", mpModel=0)  # S508
    |
 
-
 S508 The use of SNMPv1 and SNMPv2 is insecure. Use SNMPv3 if able.
   --> S508.py:20:53
    |
@@ -44,7 +53,6 @@ S508 The use of SNMPv1 and SNMPv2 is insecure. Use SNMPv3 if able.
 22 | pysnmp.hlapi.v3arch.asyncio.auth.CommunityData("public", mpModel=0)  # S508
    |
 
-
 S508 The use of SNMPv1 and SNMPv2 is insecure. Use SNMPv3 if able.
   --> S508.py:21:45
    |
@@ -56,7 +64,6 @@ S508 The use of SNMPv1 and SNMPv2 is insecure. Use SNMPv3 if able.
 23 | pysnmp.hlapi.v3arch.asyncio.CommunityData("public", mpModel=0)  # S508
    |
 
-
 S508 The use of SNMPv1 and SNMPv2 is insecure. Use SNMPv3 if able.
   --> S508.py:22:58
    |
@@ -68,7 +75,6 @@ S508 The use of SNMPv1 and SNMPv2 is insecure. Use SNMPv3 if able.
 24 | pysnmp.hlapi.v3arch.CommunityData("public", mpModel=0)  # S508
    |
 
-
 S508 The use of SNMPv1 and SNMPv2 is insecure. Use SNMPv3 if able.
   --> S508.py:23:53
    |
@@ -80,7 +86,6 @@ S508 The use of SNMPv1 and SNMPv2 is insecure. Use SNMPv3 if able.
 25 | pysnmp.hlapi.auth.CommunityData("public", mpModel=0)  # S508
    |
 
-
 S508 The use of SNMPv1 and SNMPv2 is insecure. Use SNMPv3 if able.
   --> S508.py:24:45
    |
@@ -91,7 +96,6 @@ S508 The use of SNMPv1 and SNMPv2 is insecure. Use SNMPv3 if able.
 25 | pysnmp.hlapi.auth.CommunityData("public", mpModel=0)  # S508
    |
 
-
 S508 The use of SNMPv1 and SNMPv2 is insecure. Use SNMPv3 if able.
   --> S508.py:25:43
    |

crates/ruff_linter/src/rules/flake8_bandit/snapshots/ruff_linter__rules__flake8_bandit__tests__preview__S509_S509.py.snap

@@ -1,15 +1,24 @@
 ---
 source: crates/ruff_linter/src/rules/flake8_bandit/mod.rs
 ---
---- Linter settings ---
--linter.preview = disabled
-+linter.preview = enabled
+S509 You should not use SNMPv3 without encryption. `noAuthNoPriv` & `authNoPriv` is insecure.
+ --> S509.py:4:12
+  |
+4 | insecure = UsmUserData("securityName")  # S509
+  |            ^^^^^^^^^^^
+5 | auth_no_priv = UsmUserData("securityName", "authName")  # S509
+  |
 
---- Summary ---
-Removed: 0
-Added: 4
+S509 You should not use SNMPv3 without encryption. `noAuthNoPriv` & `authNoPriv` is insecure.
+ --> S509.py:5:16
+  |
+4 | insecure = UsmUserData("securityName")  # S509
+5 | auth_no_priv = UsmUserData("securityName", "authName")  # S509
+  |                ^^^^^^^^^^^
+6 |
+7 | less_insecure = UsmUserData("securityName", "authName", "privName")  # OK
+  |
 
---- Added ---
 S509 You should not use SNMPv3 without encryption. `noAuthNoPriv` & `authNoPriv` is insecure.
   --> S509.py:15:1
    |
@@ -21,7 +30,6 @@ S509 You should not use SNMPv3 without encryption. `noAuthNoPriv` & `authNoPriv`
 17 | pysnmp.hlapi.v3arch.asyncio.auth.UsmUserData("user")  # S509
    |
 
-
 S509 You should not use SNMPv3 without encryption. `noAuthNoPriv` & `authNoPriv` is insecure.
   --> S509.py:16:1
    |
@@ -32,7 +40,6 @@ S509 You should not use SNMPv3 without encryption. `noAuthNoPriv` & `authNoPriv`
 18 | pysnmp.hlapi.auth.UsmUserData("user")  # S509
    |
 
-
 S509 You should not use SNMPv3 without encryption. `noAuthNoPriv` & `authNoPriv` is insecure.
   --> S509.py:17:1
    |
@@ -43,7 +50,6 @@ S509 You should not use SNMPv3 without encryption. `noAuthNoPriv` & `authNoPriv`
 18 | pysnmp.hlapi.auth.UsmUserData("user")  # S509
    |
 
-
 S509 You should not use SNMPv3 without encryption. `noAuthNoPriv` & `authNoPriv` is insecure.
   --> S509.py:18:1
    |

crates/ruff_linter/src/rules/flake8_boolean_trap/rules/boolean_default_value_positional_argument.rs

@@ -25,11 +25,6 @@ use crate::rules::flake8_boolean_trap::helpers::is_allowed_func_def;
 /// keyword-only argument, to force callers to be explicit when providing
 /// the argument.
 ///
-/// This rule exempts methods decorated with [`@typing.override`][override],
-/// since changing the signature of a subclass method that overrides a
-/// superclass method may cause type checkers to complain about a violation of
-/// the Liskov Substitution Principle.
-///
 /// ## Example
 /// ```python
 /// from math import ceil, floor
@@ -94,8 +89,6 @@ use crate::rules::flake8_boolean_trap::helpers::is_allowed_func_def;
 /// ## References
 /// - [Python documentation: Calls](https://docs.python.org/3/reference/expressions.html#calls)
 /// - [_How to Avoid “The Boolean Trap”_ by Adam Johnson](https://adamj.eu/tech/2021/07/10/python-type-hints-how-to-avoid-the-boolean-trap/)
-///
-/// [override]: https://docs.python.org/3/library/typing.html#typing.override
 #[derive(ViolationMetadata)]
 #[violation_metadata(stable_since = "v0.0.127")]
 pub(crate) struct BooleanDefaultValuePositionalArgument;

crates/ruff_linter/src/rules/flake8_boolean_trap/rules/boolean_type_hint_positional_argument.rs

@@ -28,7 +28,7 @@ use crate::rules::flake8_boolean_trap::helpers::is_allowed_func_def;
 /// the argument.
 ///
 /// Dunder methods that define operators are exempt from this rule, as are
-/// setters and [`@override`][override] definitions.
+/// setters and `@override` definitions.
 ///
 /// ## Example
 ///
@@ -93,8 +93,6 @@ use crate::rules::flake8_boolean_trap::helpers::is_allowed_func_def;
 /// ## References
 /// - [Python documentation: Calls](https://docs.python.org/3/reference/expressions.html#calls)
 /// - [_How to Avoid “The Boolean Trap”_ by Adam Johnson](https://adamj.eu/tech/2021/07/10/python-type-hints-how-to-avoid-the-boolean-trap/)
-///
-/// [override]: https://docs.python.org/3/library/typing.html#typing.override
 #[derive(ViolationMetadata)]
 #[violation_metadata(stable_since = "v0.0.127")]
 pub(crate) struct BooleanTypeHintPositionalArgument;

crates/ruff_linter/src/rules/flake8_builtins/rules/builtin_argument_shadowing.rs

@@ -17,8 +17,6 @@ use crate::rules::flake8_builtins::helpers::shadows_builtin;
 /// non-obvious errors, as readers may mistake the argument for the
 /// builtin and vice versa.
 ///
-/// Function definitions decorated with [`@override`][override] or
-/// [`@overload`][overload] are exempt from this rule by default.
 /// Builtins can be marked as exceptions to this rule via the
 /// [`lint.flake8-builtins.ignorelist`] configuration option.
 ///
@@ -50,9 +48,6 @@ use crate::rules::flake8_builtins::helpers::shadows_builtin;
 /// ## References
 /// - [_Is it bad practice to use a built-in function name as an attribute or method identifier?_](https://stackoverflow.com/questions/9109333/is-it-bad-practice-to-use-a-built-in-function-name-as-an-attribute-or-method-ide)
 /// - [_Why is it a bad idea to name a variable `id` in Python?_](https://stackoverflow.com/questions/77552/id-is-a-bad-variable-name-in-python)
-///
-/// [override]: https://docs.python.org/3/library/typing.html#typing.override
-/// [overload]: https://docs.python.org/3/library/typing.html#typing.overload
 #[derive(ViolationMetadata)]
 #[violation_metadata(stable_since = "v0.0.48")]
 pub(crate) struct BuiltinArgumentShadowing {

crates/ruff_linter/src/rules/flake8_pie/rules/unnecessary_placeholder.rs

@@ -1,6 +1,8 @@
 use ruff_macros::{ViolationMetadata, derive_message_formats};
+use ruff_python_ast::helpers::map_subscript;
 use ruff_python_ast::whitespace::trailing_comment_start_offset;
 use ruff_python_ast::{Expr, ExprStringLiteral, Stmt, StmtExpr};
+use ruff_python_semantic::{ScopeKind, SemanticModel};
 use ruff_text_size::Ranged;
 
 use crate::checkers::ast::Checker;
@@ -99,7 +101,7 @@ pub(crate) fn unnecessary_placeholder(checker: &Checker, body: &[Stmt]) {
                 // Ellipses are significant in protocol methods and abstract methods.
                 // Specifically, Pyright uses the presence of an ellipsis to indicate that
                 // a method is a stub, rather than a default implementation.
-                if checker.semantic().in_protocol_or_abstract_method() {
+                if in_protocol_or_abstract_method(checker.semantic()) {
                     return;
                 }
                 Placeholder::Ellipsis
@@ -161,3 +163,21 @@ impl std::fmt::Display for Placeholder {
         }
     }
 }
+
+/// Return `true` if the [`SemanticModel`] is in a `typing.Protocol` subclass or an abstract
+/// method.
+fn in_protocol_or_abstract_method(semantic: &SemanticModel) -> bool {
+    semantic.current_scopes().any(|scope| match scope.kind {
+        ScopeKind::Class(class_def) => class_def
+            .bases()
+            .iter()
+            .any(|base| semantic.match_typing_expr(map_subscript(base), "Protocol")),
+        ScopeKind::Function(function_def) => {
+            ruff_python_semantic::analyze::visibility::is_abstract(
+                &function_def.decorator_list,
+                semantic,
+            )
+        }
+        _ => false,
+    })
+}

crates/ruff_linter/src/rules/flake8_unused_arguments/rules/unused_arguments.rs

@@ -60,16 +60,6 @@ impl Violation for UnusedFunctionArgument {
 /// prefixed with an underscore, or some other value that adheres to the
 /// [`lint.dummy-variable-rgx`] pattern.
 ///
-/// This rule exempts methods decorated with [`@typing.override`][override].
-/// Removing a parameter from a subclass method (or changing a parameter's
-/// name) may cause type checkers to complain about a violation of the Liskov
-/// Substitution Principle if it means that the method now incompatibly
-/// overrides a method defined on a superclass. Explicitly decorating an
-/// overriding method with `@override` signals to Ruff that the method is
-/// intended to override a superclass method and that a type checker will
-/// enforce that it does so; Ruff therefore knows that it should not enforce
-/// rules about unused arguments on such methods.
-///
 /// ## Example
 /// ```python
 /// class Class:
@@ -86,8 +76,6 @@ impl Violation for UnusedFunctionArgument {
 ///
 /// ## Options
 /// - `lint.dummy-variable-rgx`
-///
-/// [override]: https://docs.python.org/3/library/typing.html#typing.override
 #[derive(ViolationMetadata)]
 #[violation_metadata(stable_since = "v0.0.168")]
 pub(crate) struct UnusedMethodArgument {
@@ -113,16 +101,6 @@ impl Violation for UnusedMethodArgument {
 /// prefixed with an underscore, or some other value that adheres to the
 /// [`lint.dummy-variable-rgx`] pattern.
 ///
-/// This rule exempts methods decorated with [`@typing.override`][override].
-/// Removing a parameter from a subclass method (or changing a parameter's
-/// name) may cause type checkers to complain about a violation of the Liskov
-/// Substitution Principle if it means that the method now incompatibly
-/// overrides a method defined on a superclass. Explicitly decorating an
-/// overriding method with `@override` signals to Ruff that the method is
-/// intended to override a superclass method and that a type checker will
-/// enforce that it does so; Ruff therefore knows that it should not enforce
-/// rules about unused arguments on such methods.
-///
 /// ## Example
 /// ```python
 /// class Class:
@@ -141,8 +119,6 @@ impl Violation for UnusedMethodArgument {
 ///
 /// ## Options
 /// - `lint.dummy-variable-rgx`
-///
-/// [override]: https://docs.python.org/3/library/typing.html#typing.override
 #[derive(ViolationMetadata)]
 #[violation_metadata(stable_since = "v0.0.168")]
 pub(crate) struct UnusedClassMethodArgument {
@@ -168,16 +144,6 @@ impl Violation for UnusedClassMethodArgument {
 /// prefixed with an underscore, or some other value that adheres to the
 /// [`lint.dummy-variable-rgx`] pattern.
 ///
-/// This rule exempts methods decorated with [`@typing.override`][override].
-/// Removing a parameter from a subclass method (or changing a parameter's
-/// name) may cause type checkers to complain about a violation of the Liskov
-/// Substitution Principle if it means that the method now incompatibly
-/// overrides a method defined on a superclass. Explicitly decorating an
-/// overriding method with `@override` signals to Ruff that the method is
-/// intended to override a superclass method, and that a type checker will
-/// enforce that it does so; Ruff therefore knows that it should not enforce
-/// rules about unused arguments on such methods.
-///
 /// ## Example
 /// ```python
 /// class Class:
@@ -196,8 +162,6 @@ impl Violation for UnusedClassMethodArgument {
 ///
 /// ## Options
 /// - `lint.dummy-variable-rgx`
-///
-/// [override]: https://docs.python.org/3/library/typing.html#typing.override
 #[derive(ViolationMetadata)]
 #[violation_metadata(stable_since = "v0.0.168")]
 pub(crate) struct UnusedStaticMethodArgument {

crates/ruff_linter/src/rules/pep8_naming/rules/invalid_argument_name.rs

@@ -23,7 +23,7 @@ use crate::checkers::ast::Checker;
 /// > mixedCase is allowed only in contexts where that’s already the
 /// > prevailing style (e.g. threading.py), to retain backwards compatibility.
 ///
-/// Methods decorated with [`@typing.override`][override] are ignored.
+/// Methods decorated with `@typing.override` are ignored.
 ///
 /// ## Example
 /// ```python
@@ -43,8 +43,6 @@ use crate::checkers::ast::Checker;
 ///
 /// [PEP 8]: https://peps.python.org/pep-0008/#function-and-method-arguments
 /// [preview]: https://docs.astral.sh/ruff/preview/
-///
-/// [override]: https://docs.python.org/3/library/typing.html#typing.override
 #[derive(ViolationMetadata)]
 #[violation_metadata(stable_since = "v0.0.77")]
 pub(crate) struct InvalidArgumentName {

crates/ruff_linter/src/rules/pep8_naming/rules/invalid_function_name.rs

@@ -24,11 +24,6 @@ use crate::rules::pep8_naming::settings::IgnoreNames;
 /// to ignore all functions starting with `test_` from this rule, set the
 /// [`lint.pep8-naming.extend-ignore-names`] option to `["test_*"]`.
 ///
-/// This rule exempts methods decorated with [`@typing.override`][override].
-/// Explicitly decorating a method with `@override` signals to Ruff that the method is intended
-/// to override a superclass method, and that a type checker will enforce that it does so. Ruff
-/// therefore knows that it should not enforce naming conventions on such methods.
-///
 /// ## Example
 /// ```python
 /// def myFunction():
@@ -46,7 +41,6 @@ use crate::rules::pep8_naming::settings::IgnoreNames;
 /// - `lint.pep8-naming.extend-ignore-names`
 ///
 /// [PEP 8]: https://peps.python.org/pep-0008/#function-and-variable-names
-/// [override]: https://docs.python.org/3/library/typing.html#typing.override
 #[derive(ViolationMetadata)]
 #[violation_metadata(stable_since = "v0.0.77")]
 pub(crate) struct InvalidFunctionName {

crates/ruff_linter/src/rules/pydocstyle/rules/not_missing.rs

@@ -169,12 +169,7 @@ impl Violation for UndocumentedPublicClass {
 /// If the codebase adheres to a standard format for method docstrings, follow
 /// that format for consistency.
 ///
-/// This rule exempts methods decorated with [`@typing.override`][override],
-/// since it is a common practice to document a method on a superclass but not
-/// on an overriding method in a subclass.
-///
 /// ## Example
-///
 /// ```python
 /// class Cat(Animal):
 ///     def greet(self, happy: bool = True):
@@ -185,7 +180,6 @@ impl Violation for UndocumentedPublicClass {
 /// ```
 ///
 /// Use instead (in the NumPy docstring format):
-///
 /// ```python
 /// class Cat(Animal):
 ///     def greet(self, happy: bool = True):
@@ -208,7 +202,6 @@ impl Violation for UndocumentedPublicClass {
 /// ```
 ///
 /// Or (in the Google docstring format):
-///
 /// ```python
 /// class Cat(Animal):
 ///     def greet(self, happy: bool = True):
@@ -234,8 +227,6 @@ impl Violation for UndocumentedPublicClass {
 /// - [PEP 287 – reStructuredText Docstring Format](https://peps.python.org/pep-0287/)
 /// - [NumPy Style Guide](https://numpydoc.readthedocs.io/en/latest/format.html)
 /// - [Google Python Style Guide - Docstrings](https://google.github.io/styleguide/pyguide.html#38-comments-and-docstrings)
-///
-/// [override]: https://docs.python.org/3/library/typing.html#typing.override
 #[derive(ViolationMetadata)]
 #[violation_metadata(stable_since = "v0.0.70")]
 pub(crate) struct UndocumentedPublicMethod;

crates/ruff_linter/src/rules/pylint/rules/bad_dunder_method_name.rs

@@ -21,7 +21,7 @@ use crate::rules::pylint::helpers::is_known_dunder_method;
 ///
 /// This rule will detect all methods starting and ending with at least
 /// one underscore (e.g., `_str_`), but ignores known dunder methods (like
-/// `__init__`), as well as methods that are marked with [`@override`][override].
+/// `__init__`), as well as methods that are marked with `@override`.
 ///
 /// Additional dunder methods names can be allowed via the
 /// [`lint.pylint.allow-dunder-method-names`] setting.
@@ -42,8 +42,6 @@ use crate::rules::pylint::helpers::is_known_dunder_method;
 ///
 /// ## Options
 /// - `lint.pylint.allow-dunder-method-names`
-///
-/// [override]: https://docs.python.org/3/library/typing.html#typing.override
 #[derive(ViolationMetadata)]
 #[violation_metadata(preview_since = "v0.0.285")]
 pub(crate) struct BadDunderMethodName {

crates/ruff_linter/src/rules/pylint/rules/no_self_use.rs

@@ -17,16 +17,6 @@ use crate::rules::flake8_unused_arguments::rules::is_not_implemented_stub_with_v
 /// Unused `self` parameters are usually a sign of a method that could be
 /// replaced by a function, class method, or static method.
 ///
-/// This rule exempts methods decorated with [`@typing.override`][override].
-/// Converting an instance method into a static method or class method may
-/// cause type checkers to complain about a violation of the Liskov
-/// Substitution Principle if it means that the method now incompatibly
-/// overrides a method defined on a superclass. Explicitly decorating an
-/// overriding method with `@override` signals to Ruff that the method is
-/// intended to override a superclass method and that a type checker will
-/// enforce that it does so; Ruff therefore knows that it should not enforce
-/// rules about unused `self` parameters on such methods.
-///
 /// ## Example
 /// ```python
 /// class Person:
@@ -48,8 +38,6 @@ use crate::rules::flake8_unused_arguments::rules::is_not_implemented_stub_with_v
 ///     def greeting():
 ///         print("Greetings friend!")
 /// ```
-///
-/// [override]: https://docs.python.org/3/library/typing.html#typing.override
 #[derive(ViolationMetadata)]
 #[violation_metadata(preview_since = "v0.0.286")]
 pub(crate) struct NoSelfUse {

crates/ruff_linter/src/rules/pylint/rules/too_many_arguments.rs

@@ -12,16 +12,6 @@ use crate::checkers::ast::Checker;
 /// By default, this rule allows up to five arguments, as configured by the
 /// [`lint.pylint.max-args`] option.
 ///
-/// This rule exempts methods decorated with [`@typing.override`][override].
-/// Changing the signature of a subclass method may cause type checkers to
-/// complain about a violation of the Liskov Substitution Principle if it
-/// means that the method now incompatibly overrides a method defined on a
-/// superclass. Explicitly decorating an overriding method with `@override`
-/// signals to Ruff that the method is intended to override a superclass
-/// method and that a type checker will enforce that it does so; Ruff
-/// therefore knows that it should not enforce rules about methods having
-/// too many arguments.
-///
 /// ## Why is this bad?
 /// Functions with many arguments are harder to understand, maintain, and call.
 /// Consider refactoring functions with many arguments into smaller functions
@@ -53,8 +43,6 @@ use crate::checkers::ast::Checker;
 ///
 /// ## Options
 /// - `lint.pylint.max-args`
-///
-/// [override]: https://docs.python.org/3/library/typing.html#typing.override
 #[derive(ViolationMetadata)]
 #[violation_metadata(stable_since = "v0.0.238")]
 pub(crate) struct TooManyArguments {

crates/ruff_linter/src/rules/pylint/rules/too_many_positional_arguments.rs

@@ -21,16 +21,6 @@ use crate::checkers::ast::Checker;
 /// with fewer arguments, using objects to group related arguments, or migrating to
 /// [keyword-only arguments](https://docs.python.org/3/tutorial/controlflow.html#special-parameters).
 ///
-/// This rule exempts methods decorated with [`@typing.override`][override].
-/// Changing the signature of a subclass method may cause type checkers to
-/// complain about a violation of the Liskov Substitution Principle if it
-/// means that the method now incompatibly overrides a method defined on a
-/// superclass. Explicitly decorating an overriding method with `@override`
-/// signals to Ruff that the method is intended to override a superclass
-/// method and that a type checker will enforce that it does so; Ruff
-/// therefore knows that it should not enforce rules about methods having
-/// too many arguments.
-///
 /// ## Example
 ///
 /// ```python
@@ -51,8 +41,6 @@ use crate::checkers::ast::Checker;
 ///
 /// ## Options
 /// - `lint.pylint.max-positional-args`
-///
-/// [override]: https://docs.python.org/3/library/typing.html#typing.override
 #[derive(ViolationMetadata)]
 #[violation_metadata(preview_since = "v0.1.7")]
 pub(crate) struct TooManyPositionalArguments {

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

@@ -115,7 +115,6 @@ mod tests {
     #[test_case(Rule::NonOctalPermissions, Path::new("RUF064.py"))]
     #[test_case(Rule::LoggingEagerConversion, Path::new("RUF065_0.py"))]
     #[test_case(Rule::LoggingEagerConversion, Path::new("RUF065_1.py"))]
-    #[test_case(Rule::PropertyWithoutReturn, Path::new("RUF066.py"))]
     #[test_case(Rule::RedirectedNOQA, Path::new("RUF101_0.py"))]
     #[test_case(Rule::RedirectedNOQA, Path::new("RUF101_1.py"))]
     #[test_case(Rule::InvalidRuleCode, Path::new("RUF102.py"))]

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

@@ -35,7 +35,6 @@ pub(crate) use non_octal_permissions::*;
 pub(crate) use none_not_at_end_of_union::*;
 pub(crate) use parenthesize_chained_operators::*;
 pub(crate) use post_init_default::*;
-pub(crate) use property_without_return::*;
 pub(crate) use pytest_raises_ambiguous_pattern::*;
 pub(crate) use quadratic_list_summation::*;
 pub(crate) use redirected_noqa::*;
@@ -100,7 +99,6 @@ mod non_octal_permissions;
 mod none_not_at_end_of_union;
 mod parenthesize_chained_operators;
 mod post_init_default;
-mod property_without_return;
 mod pytest_raises_ambiguous_pattern;
 mod quadratic_list_summation;
 mod redirected_noqa;

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

@@ -1,119 +0,0 @@
-use ruff_macros::{ViolationMetadata, derive_message_formats};
-use ruff_python_ast::identifier::Identifier;
-use ruff_python_ast::visitor::{Visitor, walk_expr, walk_stmt};
-use ruff_python_ast::{Expr, Stmt, StmtFunctionDef};
-use ruff_python_semantic::analyze::{function_type, visibility};
-
-use crate::checkers::ast::Checker;
-use crate::{FixAvailability, Violation};
-
-/// ## What it does
-/// Detects class `@property` methods that does not have a `return` statement.
-///
-/// ## Why is this bad?
-/// Property methods are expected to return a computed value, a missing return in a property usually indicates an implementation mistake.
-///
-/// ## Example
-/// ```python
-/// class User:
-///     @property
-///     def full_name(self):
-///         f"{self.first_name} {self.last_name}"
-/// ```
-///
-/// Use instead:
-/// ```python
-/// class User:
-///     @property
-///     def full_name(self):
-///         return f"{self.first_name} {self.last_name}"
-/// ```
-///
-/// ## References
-/// - [Python documentation: The property class](https://docs.python.org/3/library/functions.html#property)
-#[derive(ViolationMetadata)]
-#[violation_metadata(preview_since = "0.14.7")]
-pub(crate) struct PropertyWithoutReturn {
-    name: String,
-}
-
-impl Violation for PropertyWithoutReturn {
-    const FIX_AVAILABILITY: FixAvailability = FixAvailability::None;
-
-    #[derive_message_formats]
-    fn message(&self) -> String {
-        let Self { name } = self;
-        format!("`{name}` is a property without a `return` statement")
-    }
-}
-
-/// RUF066
-pub(crate) fn property_without_return(checker: &Checker, function_def: &StmtFunctionDef) {
-    let semantic = checker.semantic();
-
-    if checker.source_type.is_stub() || semantic.in_protocol_or_abstract_method() {
-        return;
-    }
-
-    let StmtFunctionDef {
-        decorator_list,
-        body,
-        name,
-        ..
-    } = function_def;
-
-    if !visibility::is_property(decorator_list, [], semantic)
-        || visibility::is_overload(decorator_list, semantic)
-        || function_type::is_stub(function_def, semantic)
-    {
-        return;
-    }
-
-    let mut visitor = PropertyVisitor::default();
-    visitor.visit_body(body);
-    if visitor.found {
-        return;
-    }
-
-    checker.report_diagnostic(
-        PropertyWithoutReturn {
-            name: name.to_string(),
-        },
-        function_def.identifier(),
-    );
-}
-
-#[derive(Default)]
-struct PropertyVisitor {
-    found: bool,
-}
-
-// NOTE: We are actually searching for the presence of
-// `yield`/`yield from`/`raise`/`return` statement/expression,
-// as having one of those indicates that there's likely no implementation mistake
-impl Visitor<'_> for PropertyVisitor {
-    fn visit_expr(&mut self, expr: &Expr) {
-        if self.found {
-            return;
-        }
-
-        match expr {
-            Expr::Yield(_) | Expr::YieldFrom(_) => self.found = true,
-            _ => walk_expr(self, expr),
-        }
-    }
-
-    fn visit_stmt(&mut self, stmt: &Stmt) {
-        if self.found {
-            return;
-        }
-
-        match stmt {
-            Stmt::Return(_) | Stmt::Raise(_) => self.found = true,
-            Stmt::FunctionDef(_) => {
-                // Do not recurse into nested functions; they're evaluated separately.
-            }
-            _ => walk_stmt(self, stmt),
-        }
-    }
-}

crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF066_RUF066.py.snap

@@ -1,31 +0,0 @@
----
-source: crates/ruff_linter/src/rules/ruff/mod.rs
----
-RUF066 `name` is a property without a `return` statement
- --> RUF066.py:7:9
-  |
-5 | class User:  # Test normal class properties
-6 |     @property
-7 |     def name(self):  # ERROR: No return
-  |         ^^^^
-8 |         f"{self.first_name} {self.last_name}"
-  |
-
-RUF066 `nested` is a property without a `return` statement
-  --> RUF066.py:18:9
-   |
-17 |     @property
-18 |     def nested(self):  # ERROR: Property itself doesn't return
-   |         ^^^^^^
-19 |         def inner():
-20 |             return 0
-   |
-
-RUF066 `prop2` is a property without a `return` statement
-  --> RUF066.py:43:9
-   |
-42 |     @property
-43 |     def prop2(self):  # ERROR: Not returning something (even when we are inside an ABC)
-   |         ^^^^^
-44 |         50
-   |

crates/ruff_python_ast/src/nodes.rs

@@ -773,14 +773,10 @@ pub trait StringFlags: Copy {
     }
 
     /// The total length of the string's closer.
-    /// This is always equal to `self.quote_len()`, except when the string is unclosed,
-    /// in which case the length is zero.
+    /// This is always equal to `self.quote_len()`,
+    /// but is provided here for symmetry with the `opener_len()` method.
     fn closer_len(self) -> TextSize {
-        if self.is_unclosed() {
-            TextSize::default()
-        } else {
-            self.quote_len()
-        }
+        self.quote_len()
     }
 
     fn as_any_string_flags(self) -> AnyStringFlags {

crates/ruff_python_parser/resources/inline/err/ipython_help_escape_command_error_recovery_1.py

@@ -1,3 +0,0 @@
-# parse_options: {"mode": "ipython"}
-with (a, ?b)
-?

crates/ruff_python_parser/resources/inline/err/ipython_help_escape_command_error_recovery_2.py

@@ -1,3 +0,0 @@
-# parse_options: {"mode": "ipython"}
-with (a, ?b
-?

crates/ruff_python_parser/resources/inline/err/ipython_help_escape_command_error_recovery_3.py

@@ -1,4 +0,0 @@
-# parse_options: {"mode": "ipython"}
-with a, ?b
-?
-x = 1

crates/ruff_python_parser/src/parser/mod.rs

@@ -1115,27 +1115,7 @@ impl RecoveryContextKind {
                     TokenKind::Colon => Some(ListTerminatorKind::ErrorRecovery),
                     _ => None,
                 },
-                // test_err ipython_help_escape_command_error_recovery_1
-                // # parse_options: {"mode": "ipython"}
-                // with (a, ?b)
-                // ?
-
-                // test_err ipython_help_escape_command_error_recovery_2
-                // # parse_options: {"mode": "ipython"}
-                // with (a, ?b
-                // ?
-
-                // test_err ipython_help_escape_command_error_recovery_3
-                // # parse_options: {"mode": "ipython"}
-                // with a, ?b
-                // ?
-                // x = 1
-                WithItemKind::Unparenthesized => matches!(
-                    p.current_token_kind(),
-                    TokenKind::Colon | TokenKind::Newline
-                )
-                .then_some(ListTerminatorKind::Regular),
-                WithItemKind::ParenthesizedExpression => p
+                WithItemKind::Unparenthesized | WithItemKind::ParenthesizedExpression => p
                     .at(TokenKind::Colon)
                     .then_some(ListTerminatorKind::Regular),
             },

crates/ruff_python_parser/tests/snapshots/invalid_syntax@ipython_help_escape_command_error_recovery_1.py.snap

@@ -1,84 +0,0 @@
----
-source: crates/ruff_python_parser/tests/fixtures.rs
-input_file: crates/ruff_python_parser/resources/inline/err/ipython_help_escape_command_error_recovery_1.py
----
-## AST
-
-```
-Module(
-    ModModule {
-        node_index: NodeIndex(None),
-        range: 0..52,
-        body: [
-            With(
-                StmtWith {
-                    node_index: NodeIndex(None),
-                    range: 37..49,
-                    is_async: false,
-                    items: [
-                        WithItem {
-                            range: 43..44,
-                            node_index: NodeIndex(None),
-                            context_expr: Name(
-                                ExprName {
-                                    node_index: NodeIndex(None),
-                                    range: 43..44,
-                                    id: Name("a"),
-                                    ctx: Load,
-                                },
-                            ),
-                            optional_vars: None,
-                        },
-                        WithItem {
-                            range: 47..48,
-                            node_index: NodeIndex(None),
-                            context_expr: Name(
-                                ExprName {
-                                    node_index: NodeIndex(None),
-                                    range: 47..48,
-                                    id: Name("b"),
-                                    ctx: Load,
-                                },
-                            ),
-                            optional_vars: None,
-                        },
-                    ],
-                    body: [],
-                },
-            ),
-            IpyEscapeCommand(
-                StmtIpyEscapeCommand {
-                    node_index: NodeIndex(None),
-                    range: 50..51,
-                    kind: Help,
-                    value: "",
-                },
-            ),
-        ],
-    },
-)
-```
-## Errors
-
-  |
-1 | # parse_options: {"mode": "ipython"}
-2 | with (a, ?b)
-  |          ^ Syntax Error: Expected `,`, found `?`
-3 | ?
-  |
-
-
-  |
-1 | # parse_options: {"mode": "ipython"}
-2 | with (a, ?b)
-  |             ^ Syntax Error: Expected `:`, found newline
-3 | ?
-  |
-
-
-  |
-1 | # parse_options: {"mode": "ipython"}
-2 | with (a, ?b)
-3 | ?
-  | ^ Syntax Error: Expected an indented block after `with` statement
-  |

crates/ruff_python_parser/tests/snapshots/invalid_syntax@ipython_help_escape_command_error_recovery_2.py.snap

@@ -1,80 +0,0 @@
----
-source: crates/ruff_python_parser/tests/fixtures.rs
-input_file: crates/ruff_python_parser/resources/inline/err/ipython_help_escape_command_error_recovery_2.py
----
-## AST
-
-```
-Module(
-    ModModule {
-        node_index: NodeIndex(None),
-        range: 0..51,
-        body: [
-            With(
-                StmtWith {
-                    node_index: NodeIndex(None),
-                    range: 37..51,
-                    is_async: false,
-                    items: [
-                        WithItem {
-                            range: 42..51,
-                            node_index: NodeIndex(None),
-                            context_expr: Tuple(
-                                ExprTuple {
-                                    node_index: NodeIndex(None),
-                                    range: 42..51,
-                                    elts: [
-                                        Name(
-                                            ExprName {
-                                                node_index: NodeIndex(None),
-                                                range: 43..44,
-                                                id: Name("a"),
-                                                ctx: Load,
-                                            },
-                                        ),
-                                        Name(
-                                            ExprName {
-                                                node_index: NodeIndex(None),
-                                                range: 47..48,
-                                                id: Name("b"),
-                                                ctx: Load,
-                                            },
-                                        ),
-                                    ],
-                                    ctx: Load,
-                                    parenthesized: true,
-                                },
-                            ),
-                            optional_vars: None,
-                        },
-                    ],
-                    body: [],
-                },
-            ),
-        ],
-    },
-)
-```
-## Errors
-
-  |
-1 | # parse_options: {"mode": "ipython"}
-2 | with (a, ?b
-  |          ^ Syntax Error: Expected an expression or a ')'
-3 | ?
-  |
-
-
-  |
-1 | # parse_options: {"mode": "ipython"}
-2 | with (a, ?b
-3 | ?
-  | ^ Syntax Error: Expected `,`, found `?`
-  |
-
-
-  |
-2 | with (a, ?b
-3 | ?
-  |  ^ Syntax Error: unexpected EOF while parsing
-  |

crates/ruff_python_parser/tests/snapshots/invalid_syntax@ipython_help_escape_command_error_recovery_3.py.snap

@@ -1,112 +0,0 @@
----
-source: crates/ruff_python_parser/tests/fixtures.rs
-input_file: crates/ruff_python_parser/resources/inline/err/ipython_help_escape_command_error_recovery_3.py
----
-## AST
-
-```
-Module(
-    ModModule {
-        node_index: NodeIndex(None),
-        range: 0..56,
-        body: [
-            With(
-                StmtWith {
-                    node_index: NodeIndex(None),
-                    range: 37..47,
-                    is_async: false,
-                    items: [
-                        WithItem {
-                            range: 42..43,
-                            node_index: NodeIndex(None),
-                            context_expr: Name(
-                                ExprName {
-                                    node_index: NodeIndex(None),
-                                    range: 42..43,
-                                    id: Name("a"),
-                                    ctx: Load,
-                                },
-                            ),
-                            optional_vars: None,
-                        },
-                        WithItem {
-                            range: 46..47,
-                            node_index: NodeIndex(None),
-                            context_expr: Name(
-                                ExprName {
-                                    node_index: NodeIndex(None),
-                                    range: 46..47,
-                                    id: Name("b"),
-                                    ctx: Load,
-                                },
-                            ),
-                            optional_vars: None,
-                        },
-                    ],
-                    body: [],
-                },
-            ),
-            IpyEscapeCommand(
-                StmtIpyEscapeCommand {
-                    node_index: NodeIndex(None),
-                    range: 48..49,
-                    kind: Help,
-                    value: "",
-                },
-            ),
-            Assign(
-                StmtAssign {
-                    node_index: NodeIndex(None),
-                    range: 50..55,
-                    targets: [
-                        Name(
-                            ExprName {
-                                node_index: NodeIndex(None),
-                                range: 50..51,
-                                id: Name("x"),
-                                ctx: Store,
-                            },
-                        ),
-                    ],
-                    value: NumberLiteral(
-                        ExprNumberLiteral {
-                            node_index: NodeIndex(None),
-                            range: 54..55,
-                            value: Int(
-                                1,
-                            ),
-                        },
-                    ),
-                },
-            ),
-        ],
-    },
-)
-```
-## Errors
-
-  |
-1 | # parse_options: {"mode": "ipython"}
-2 | with a, ?b
-  |         ^ Syntax Error: Expected `,`, found `?`
-3 | ?
-4 | x = 1
-  |
-
-
-  |
-1 | # parse_options: {"mode": "ipython"}
-2 | with a, ?b
-  |           ^ Syntax Error: Expected `:`, found newline
-3 | ?
-4 | x = 1
-  |
-
-
-  |
-1 | # parse_options: {"mode": "ipython"}
-2 | with a, ?b
-3 | ?
-  | ^ Syntax Error: Expected an indented block after `with` statement
-4 | x = 1
-  |

crates/ruff_python_semantic/src/model.rs

@@ -3,13 +3,12 @@ use std::path::Path;
 use bitflags::bitflags;
 use rustc_hash::FxHashMap;
 
-use ruff_python_ast::helpers::{from_relative_import, map_subscript};
+use ruff_python_ast::helpers::from_relative_import;
 use ruff_python_ast::name::{QualifiedName, UnqualifiedName};
 use ruff_python_ast::{self as ast, Expr, ExprContext, PySourceType, Stmt};
 use ruff_text_size::{Ranged, TextRange, TextSize};
 
 use crate::Imported;
-use crate::analyze::visibility;
 use crate::binding::{
     Binding, BindingFlags, BindingId, BindingKind, Bindings, Exceptions, FromImport, Import,
     SubmoduleImport,
@@ -2154,21 +2153,6 @@ impl<'a> SemanticModel<'a> {
             function.range() == function_def.range()
         })
     }
-
-    /// Return `true` if the model is in a `typing.Protocol` subclass or an abstract
-    /// method.
-    pub fn in_protocol_or_abstract_method(&self) -> bool {
-        self.current_scopes().any(|scope| match scope.kind {
-            ScopeKind::Class(class_def) => class_def
-                .bases()
-                .iter()
-                .any(|base| self.match_typing_expr(map_subscript(base), "Protocol")),
-            ScopeKind::Function(function_def) => {
-                visibility::is_abstract(&function_def.decorator_list, self)
-            }
-            _ => false,
-        })
-    }
 }
 
 pub struct ShadowedBinding {

crates/ruff_wasm/Cargo.toml

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

crates/ty/docs/rules.md

@@ -39,7 +39,7 @@ def test(): -> "int":
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20call-non-callable" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L134" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L121" target="_blank">View source</a>
 </small>
 
 
@@ -63,7 +63,7 @@ Calling a non-callable object will raise a `TypeError` at runtime.
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20conflicting-argument-forms" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L178" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L165" target="_blank">View source</a>
 </small>
 
 
@@ -95,7 +95,7 @@ f(int)  # error
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20conflicting-declarations" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L204" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L191" target="_blank">View source</a>
 </small>
 
 
@@ -126,7 +126,7 @@ a = 1
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20conflicting-metaclass" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L229" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L216" target="_blank">View source</a>
 </small>
 
 
@@ -158,7 +158,7 @@ class C(A, B): ...
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20cyclic-class-definition" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L255" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L242" target="_blank">View source</a>
 </small>
 
 
@@ -184,41 +184,13 @@ class B(A): ...
 
 [method resolution order]: https://docs.python.org/3/glossary.html#term-method-resolution-order
 
-## `cyclic-type-alias-definition`
-
-<small>
-Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
-Preview (since <a href="https://github.com/astral-sh/ty/releases/tag/1.0.0">1.0.0</a>) ·
-<a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20cyclic-type-alias-definition" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L281" target="_blank">View source</a>
-</small>
-
-
-**What it does**
-
-Checks for type alias definitions that (directly or mutually) refer to themselves.
-
-**Why is it bad?**
-
-Although it is permitted to define a recursive type alias, it is not meaningful
-to have a type alias whose expansion can only result in itself, and is therefore not allowed.
-
-**Examples**
-
-```python
-type Itself = Itself
-
-type A = B
-type B = A
-```
-
 ## `duplicate-base`
 
 <small>
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20duplicate-base" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L342" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L307" target="_blank">View source</a>
 </small>
 
 
@@ -245,7 +217,7 @@ class B(A, A): ...
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.12">0.0.1-alpha.12</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20duplicate-kw-only" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L363" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L328" target="_blank">View source</a>
 </small>
 
 
@@ -357,7 +329,7 @@ def test(): -> "Literal[5]":
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20inconsistent-mro" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L567" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L532" target="_blank">View source</a>
 </small>
 
 
@@ -387,7 +359,7 @@ class C(A, B): ...
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20index-out-of-bounds" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L591" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L556" target="_blank">View source</a>
 </small>
 
 
@@ -413,7 +385,7 @@ t[3]  # IndexError: tuple index out of range
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.12">0.0.1-alpha.12</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20instance-layout-conflict" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L395" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L360" target="_blank">View source</a>
 </small>
 
 
@@ -502,7 +474,7 @@ an atypical memory layout.
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-argument-type" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L645" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L610" target="_blank">View source</a>
 </small>
 
 
@@ -529,7 +501,7 @@ func("foo")  # error: [invalid-argument-type]
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-assignment" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L685" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L650" target="_blank">View source</a>
 </small>
 
 
@@ -557,7 +529,7 @@ a: int = ''
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-attribute-access" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1948" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1809" target="_blank">View source</a>
 </small>
 
 
@@ -591,7 +563,7 @@ C.instance_var = 3  # error: Cannot assign to instance variable
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.19">0.0.1-alpha.19</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-await" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L707" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L672" target="_blank">View source</a>
 </small>
 
 
@@ -627,7 +599,7 @@ asyncio.run(main())
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-base" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L737" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L702" target="_blank">View source</a>
 </small>
 
 
@@ -651,7 +623,7 @@ class A(42): ...  # error: [invalid-base]
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-context-manager" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L788" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L753" target="_blank">View source</a>
 </small>
 
 
@@ -678,7 +650,7 @@ with 1:
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-declaration" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L809" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L774" target="_blank">View source</a>
 </small>
 
 
@@ -707,7 +679,7 @@ a: str
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-exception-caught" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L832" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L797" target="_blank">View source</a>
 </small>
 
 
@@ -745,55 +717,13 @@ except ZeroDivisionError:
 
  This rule corresponds to Ruff's [`except-with-non-exception-classes` (`B030`)](https://docs.astral.sh/ruff/rules/except-with-non-exception-classes)
 
-## `invalid-explicit-override`
-
-<small>
-Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
-Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.28">0.0.1-alpha.28</a> ·
-<a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-explicit-override" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1645" target="_blank">View source</a>
-</small>
-
-
-**What it does**
-
-Checks for methods that are decorated with `@override` but do not override any method in a superclass.
-
-**Why is this bad?**
-
-Decorating a method with `@override` declares to the type checker that the intention is that it should
-override a method from a superclass.
-
-**Example**
-
-
-```python
-from typing import override
-
-class A:
-    @override
-    def foo(self): ...  # Error raised here
-
-class B(A):
-    @override
-    def ffooo(self): ...  # Error raised here
-
-class C:
-    @override
-    def __repr__(self): ...  # fine: overrides `object.__repr__`
-
-class D(A):
-    @override
-    def foo(self): ...  # fine: overrides `A.foo`
-```
-
 ## `invalid-generic-class`
 
 <small>
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-generic-class" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L868" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L833" target="_blank">View source</a>
 </small>
 
 
@@ -826,7 +756,7 @@ class C[U](Generic[T]): ...
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.17">0.0.1-alpha.17</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-key" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L612" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L577" target="_blank">View source</a>
 </small>
 
 
@@ -865,7 +795,7 @@ carol = Person(name="Carol", age=25)  # typo!
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-legacy-type-variable" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L894" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L859" target="_blank">View source</a>
 </small>
 
 
@@ -900,7 +830,7 @@ def f(t: TypeVar("U")): ...
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-metaclass" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L991" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L956" target="_blank">View source</a>
 </small>
 
 
@@ -928,120 +858,13 @@ class B(metaclass=f): ...
 
 - [Python documentation: Metaclasses](https://docs.python.org/3/reference/datamodel.html#metaclasses)
 
-## `invalid-method-override`
-
-<small>
-Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
-Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.20">0.0.1-alpha.20</a> ·
-<a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-method-override" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L2076" target="_blank">View source</a>
-</small>
-
-
-**What it does**
-
-Detects method overrides that violate the [Liskov Substitution Principle] ("LSP").
-
-The LSP states that an instance of a subtype should be substitutable for an instance of its supertype.
-Applied to Python, this means:
-1. All argument combinations a superclass method accepts
-   must also be accepted by an overriding subclass method.
-2. The return type of an overriding subclass method must be a subtype
-   of the return type of the superclass method.
-
-**Why is this bad?**
-
-Violating the Liskov Substitution Principle will lead to many of ty's assumptions and
-inferences being incorrect, which will mean that it will fail to catch many possible
-type errors in your code.
-
-**Example**
-
-```python
-class Super:
-    def method(self, x) -> int:
-        return 42
-
-class Sub(Super):
-    # Liskov violation: `str` is not a subtype of `int`,
-    # but the supertype method promises to return an `int`.
-    def method(self, x) -> str:  # error: [invalid-override]
-        return "foo"
-
-def accepts_super(s: Super) -> int:
-    return s.method(x=42)
-
-accepts_super(Sub())  # The result of this call is a string, but ty will infer
-                      # it to be an `int` due to the violation of the Liskov Substitution Principle.
-
-class Sub2(Super):
-    # Liskov violation: the superclass method can be called with a `x=`
-    # keyword argument, but the subclass method does not accept it.
-    def method(self, y) -> int:  # error: [invalid-override]
-       return 42
-
-accepts_super(Sub2())  # TypeError at runtime: method() got an unexpected keyword argument 'x'
-                       # ty cannot catch this error due to the violation of the Liskov Substitution Principle.
-```
-
-**Common issues**
-
-
-**Why does ty complain about my `__eq__` method?**
-
-
-`__eq__` and `__ne__` methods in Python are generally expected to accept arbitrary
-objects as their second argument, for example:
-
-```python
-class A:
-    x: int
-
-    def __eq__(self, other: object) -> bool:
-        # gracefully handle an object of an unexpected type
-        # without raising an exception
-        if not isinstance(other, A):
-            return False
-        return self.x == other.x
-```
-
-If `A.__eq__` here were annotated as only accepting `A` instances for its second argument,
-it would imply that you wouldn't be able to use `==` between instances of `A` and
-instances of unrelated classes without an exception possibly being raised. While some
-classes in Python do indeed behave this way, the strongly held convention is that it should
-be avoided wherever possible. As part of this check, therefore, ty enforces that `__eq__`
-and `__ne__` methods accept `object` as their second argument.
-
-**Why does ty disagree with Ruff about how to write my method?**
-
-
-Ruff has several rules that will encourage you to rename a parameter, or change its type
-signature, if it thinks you're falling into a certain anti-pattern. For example, Ruff's
-[ARG002](https://docs.astral.sh/ruff/rules/unused-method-argument/) rule recommends that an
-unused parameter should either be removed or renamed to start with `_`. Applying either of
-these suggestions can cause ty to start reporting an `invalid-method-override` error if
-the function in question is a method on a subclass that overrides a method on a superclass,
-and the change would cause the subclass method to no longer accept all argument combinations
-that the superclass method accepts.
-
-This can usually be resolved by adding [`@typing.override`][override] to your method
-definition. Ruff knows that a method decorated with `@typing.override` is intended to
-override a method by the same name on a superclass, and avoids reporting rules like ARG002
-for such methods; it knows that the changes recommended by ARG002 would violate the Liskov
-Substitution Principle.
-
-Correct use of `@override` is enforced by ty's `invalid-explicit-override` rule.
-
-[Liskov Substitution Principle]: https://en.wikipedia.org/wiki/Liskov_substitution_principle
-[override]: https://docs.python.org/3/library/typing.html#typing.override
-
 ## `invalid-named-tuple`
 
 <small>
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.19">0.0.1-alpha.19</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-named-tuple" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L541" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L506" target="_blank">View source</a>
 </small>
 
 
@@ -1073,7 +896,7 @@ TypeError: can only inherit from a NamedTuple type and Generic
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Preview (since <a href="https://github.com/astral-sh/ty/releases/tag/1.0.0">1.0.0</a>) ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-newtype" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L967" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L932" target="_blank">View source</a>
 </small>
 
 
@@ -1103,7 +926,7 @@ Baz = NewType("Baz", int | str)  # error: invalid base for `typing.NewType`
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-overload" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1018" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L983" target="_blank">View source</a>
 </small>
 
 
@@ -1153,7 +976,7 @@ def foo(x: int) -> int: ...
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-parameter-default" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1117" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1082" target="_blank">View source</a>
 </small>
 
 
@@ -1179,7 +1002,7 @@ def f(a: int = ''): ...
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-paramspec" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L922" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L887" target="_blank">View source</a>
 </small>
 
 
@@ -1210,7 +1033,7 @@ P2 = ParamSpec("S2")  # error: ParamSpec name must match the variable it's assig
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-protocol" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L477" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L442" target="_blank">View source</a>
 </small>
 
 
@@ -1244,7 +1067,7 @@ TypeError: Protocols can only inherit from other protocols, got <class 'int'>
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-raise" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1137" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1102" target="_blank">View source</a>
 </small>
 
 
@@ -1293,7 +1116,7 @@ def g():
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-return-type" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L666" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L631" target="_blank">View source</a>
 </small>
 
 
@@ -1318,7 +1141,7 @@ def func() -> int:
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-super-argument" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1180" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1145" target="_blank">View source</a>
 </small>
 
 
@@ -1376,7 +1199,7 @@ TODO #14889
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.6">0.0.1-alpha.6</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-type-alias-type" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L946" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L911" target="_blank">View source</a>
 </small>
 
 
@@ -1397,60 +1220,13 @@ IntOrStr = TypeAliasType("IntOrStr", int | str)  # okay
 NewAlias = TypeAliasType(get_name(), int)        # error: TypeAliasType name must be a string literal
 ```
 
-## `invalid-type-arguments`
-
-<small>
-Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
-Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.29">0.0.1-alpha.29</a> ·
-<a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-type-arguments" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1412" target="_blank">View source</a>
-</small>
-
-
-**What it does**
-
-Checks for invalid type arguments in explicit type specialization.
-
-**Why is this bad?**
-
-Providing the wrong number of type arguments or type arguments that don't
-satisfy the type variable's bounds or constraints will lead to incorrect
-type inference and may indicate a misunderstanding of the generic type's
-interface.
-
-**Examples**
-
-
-Using legacy type variables:
-```python
-from typing import Generic, TypeVar
-
-T1 = TypeVar('T1', int, str)
-T2 = TypeVar('T2', bound=int)
-
-class Foo1(Generic[T1]): ...
-class Foo2(Generic[T2]): ...
-
-Foo1[bytes]  # error: bytes does not satisfy T1's constraints
-Foo2[str]  # error: str does not satisfy T2's bound
-```
-
-Using PEP 695 type variables:
-```python
-class Foo[T]: ...
-class Bar[T, U]: ...
-
-Foo[int, str]  # error: too many arguments
-Bar[int]  # error: too few arguments
-```
-
 ## `invalid-type-checking-constant`
 
 <small>
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-type-checking-constant" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1219" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1184" target="_blank">View source</a>
 </small>
 
 
@@ -1480,7 +1256,7 @@ TYPE_CHECKING = ''
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-type-form" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1243" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1208" target="_blank">View source</a>
 </small>
 
 
@@ -1510,7 +1286,7 @@ b: Annotated[int]  # `Annotated` expects at least two arguments
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.11">0.0.1-alpha.11</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-type-guard-call" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1295" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1260" target="_blank">View source</a>
 </small>
 
 
@@ -1544,7 +1320,7 @@ f(10)  # Error
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.11">0.0.1-alpha.11</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-type-guard-definition" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1267" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1232" target="_blank">View source</a>
 </small>
 
 
@@ -1578,7 +1354,7 @@ class C:
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-type-variable-constraints" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1323" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1288" target="_blank">View source</a>
 </small>
 
 
@@ -1613,7 +1389,7 @@ T = TypeVar('T', bound=str)  # valid bound TypeVar
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20missing-argument" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1352" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1317" target="_blank">View source</a>
 </small>
 
 
@@ -1638,7 +1414,7 @@ func()  # TypeError: func() missing 1 required positional argument: 'x'
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.20">0.0.1-alpha.20</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20missing-typed-dict-key" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L2049" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1910" target="_blank">View source</a>
 </small>
 
 
@@ -1671,7 +1447,7 @@ alice["age"]  # KeyError
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20no-matching-overload" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1371" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1336" target="_blank">View source</a>
 </small>
 
 
@@ -1700,7 +1476,7 @@ func("string")  # error: [no-matching-overload]
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20non-subscriptable" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1394" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1359" target="_blank">View source</a>
 </small>
 
 
@@ -1724,7 +1500,7 @@ Subscripting an object that does not support it will raise a `TypeError` at runt
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20not-iterable" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1453" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1377" target="_blank">View source</a>
 </small>
 
 
@@ -1744,46 +1520,13 @@ for i in 34:  # TypeError: 'int' object is not iterable
     pass
 ```
 
-## `override-of-final-method`
-
-<small>
-Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
-Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.29">0.0.1-alpha.29</a> ·
-<a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20override-of-final-method" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1618" target="_blank">View source</a>
-</small>
-
-
-**What it does**
-
-Checks for methods on subclasses that override superclass methods decorated with `@final`.
-
-**Why is this bad?**
-
-Decorating a method with `@final` declares to the type checker that it should not be
-overridden on any subclass.
-
-**Example**
-
-
-```python
-from typing import final
-
-class A:
-    @final
-    def foo(self): ...
-
-class B(A):
-    def foo(self): ...  # Error raised here
-```
-
 ## `parameter-already-assigned`
 
 <small>
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20parameter-already-assigned" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1504" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1428" target="_blank">View source</a>
 </small>
 
 
@@ -1810,7 +1553,7 @@ f(1, x=2)  # Error raised here
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.22">0.0.1-alpha.22</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20positional-only-parameter-as-kwarg" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1802" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1663" target="_blank">View source</a>
 </small>
 
 
@@ -1868,7 +1611,7 @@ def test(): -> "int":
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20static-assert-error" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1924" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1785" target="_blank">View source</a>
 </small>
 
 
@@ -1898,7 +1641,7 @@ static_assert(int(2.0 * 3.0) == 6)  # error: does not have a statically known tr
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20subclass-of-final-class" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1595" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1519" target="_blank">View source</a>
 </small>
 
 
@@ -1927,7 +1670,7 @@ class B(A): ...  # Error raised here
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20too-many-positional-arguments" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1703" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1564" target="_blank">View source</a>
 </small>
 
 
@@ -1954,7 +1697,7 @@ f("foo")  # Error raised here
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20type-assertion-failure" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1681" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1542" target="_blank">View source</a>
 </small>
 
 
@@ -1982,7 +1725,7 @@ def _(x: int):
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20unavailable-implicit-super-arguments" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1724" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1585" target="_blank">View source</a>
 </small>
 
 
@@ -2028,7 +1771,7 @@ class A:
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20unknown-argument" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1781" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1642" target="_blank">View source</a>
 </small>
 
 
@@ -2055,7 +1798,7 @@ f(x=1, y=2)  # Error raised here
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20unresolved-attribute" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1823" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1684" target="_blank">View source</a>
 </small>
 
 
@@ -2083,7 +1826,7 @@ A().foo  # AttributeError: 'A' object has no attribute 'foo'
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20unresolved-import" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1845" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1706" target="_blank">View source</a>
 </small>
 
 
@@ -2108,7 +1851,7 @@ import foo  # ModuleNotFoundError: No module named 'foo'
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20unresolved-reference" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1864" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1725" target="_blank">View source</a>
 </small>
 
 
@@ -2133,7 +1876,7 @@ print(x)  # NameError: name 'x' is not defined
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20unsupported-bool-conversion" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1473" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1397" target="_blank">View source</a>
 </small>
 
 
@@ -2170,7 +1913,7 @@ b1 < b2 < b1  # exception raised here
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20unsupported-operator" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1883" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1744" target="_blank">View source</a>
 </small>
 
 
@@ -2198,7 +1941,7 @@ A() + A()  # TypeError: unsupported operand type(s) for +: 'A' and 'A'
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20zero-stepsize-in-slice" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1905" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1766" target="_blank">View source</a>
 </small>
 
 
@@ -2223,7 +1966,7 @@ l[1:10:0]  # ValueError: slice step cannot be zero
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'warn'."><code>warn</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.20">0.0.1-alpha.20</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20ambiguous-protocol-member" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L506" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L471" target="_blank">View source</a>
 </small>
 
 
@@ -2264,7 +2007,7 @@ class SubProto(BaseProto, Protocol):
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'warn'."><code>warn</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.16">0.0.1-alpha.16</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20deprecated" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L321" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L286" target="_blank">View source</a>
 </small>
 
 
@@ -2291,7 +2034,7 @@ old_func()  # emits [deprecated] diagnostic
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'warn'."><code>warn</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20ignore-comment-unknown-rule" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Fsuppression.rs#L47" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Fsuppression.rs#L40" target="_blank">View source</a>
 </small>
 
 
@@ -2322,7 +2065,7 @@ a = 20 / 0  # ty: ignore[division-by-zero]
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'warn'."><code>warn</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-ignore-comment" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Fsuppression.rs#L72" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Fsuppression.rs#L65" target="_blank">View source</a>
 </small>
 
 
@@ -2352,7 +2095,7 @@ a = 20 / 0  # type: ignore
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'warn'."><code>warn</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.22">0.0.1-alpha.22</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20possibly-missing-attribute" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1525" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1449" target="_blank">View source</a>
 </small>
 
 
@@ -2380,7 +2123,7 @@ A.c  # AttributeError: type object 'A' has no attribute 'c'
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'warn'."><code>warn</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.22">0.0.1-alpha.22</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20possibly-missing-implicit-call" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L152" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L139" target="_blank">View source</a>
 </small>
 
 
@@ -2412,7 +2155,7 @@ A()[0]  # TypeError: 'A' object is not subscriptable
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'warn'."><code>warn</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.22">0.0.1-alpha.22</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20possibly-missing-import" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1547" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1471" target="_blank">View source</a>
 </small>
 
 
@@ -2444,7 +2187,7 @@ from module import a  # ImportError: cannot import name 'a' from 'module'
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'warn'."><code>warn</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20redundant-cast" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1976" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1837" target="_blank">View source</a>
 </small>
 
 
@@ -2471,7 +2214,7 @@ cast(int, f())  # Redundant
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'warn'."><code>warn</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20undefined-reveal" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1763" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1624" target="_blank">View source</a>
 </small>
 
 
@@ -2495,7 +2238,7 @@ reveal_type(1)  # NameError: name 'reveal_type' is not defined
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'warn'."><code>warn</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.15">0.0.1-alpha.15</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20unresolved-global" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1997" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1858" target="_blank">View source</a>
 </small>
 
 
@@ -2553,7 +2296,7 @@ def g():
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'warn'."><code>warn</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.7">0.0.1-alpha.7</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20unsupported-base" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L755" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L720" target="_blank">View source</a>
 </small>
 
 
@@ -2592,7 +2335,7 @@ class D(C): ...  # error: [unsupported-base]
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'warn'."><code>warn</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.22">0.0.1-alpha.22</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20useless-overload-body" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1061" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1026" target="_blank">View source</a>
 </small>
 
 
@@ -2655,7 +2398,7 @@ def foo(x: int | str) -> int | str:
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'ignore'."><code>ignore</code></a> ·
 Preview (since <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a>) ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20division-by-zero" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L303" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L268" target="_blank">View source</a>
 </small>
 
 
@@ -2679,7 +2422,7 @@ Dividing by zero raises a `ZeroDivisionError` at runtime.
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'ignore'."><code>ignore</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20possibly-unresolved-reference" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1573" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1497" target="_blank">View source</a>
 </small>
 
 
@@ -2707,7 +2450,7 @@ print(x)  # NameError: name 'x' is not defined
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'ignore'."><code>ignore</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20unused-ignore-comment" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Fsuppression.rs#L22" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Fsuppression.rs#L15" target="_blank">View source</a>
 </small>
 
 

crates/ty/src/lib.rs

@@ -313,8 +313,7 @@ impl MainLoop {
                     let terminal_settings = db.project().settings(db).terminal();
                     let display_config = DisplayDiagnosticConfig::default()
                         .format(terminal_settings.output_format.into())
-                        .color(colored::control::SHOULD_COLORIZE.should_colorize())
-                        .show_fix_diff(true);
+                        .color(colored::control::SHOULD_COLORIZE.should_colorize());
 
                     if check_revision == revision {
                         if db.project().files(db).is_empty() {

crates/ty/tests/cli/python_environment.rs

@@ -37,8 +37,7 @@ fn config_override_python_version() -> anyhow::Result<()> {
     5 | print(sys.last_exc)
       |       ^^^^^^^^^^^^
       |
-    info: The member may be available on other Python versions or platforms
-    info: Python 3.11 was assumed when resolving the `last_exc` attribute
+    info: Python 3.11 was assumed when accessing `last_exc`
      --> pyproject.toml:3:18
       |
     2 | [tool.ty.environment]
@@ -1180,8 +1179,6 @@ fn defaults_to_a_new_python_version() -> anyhow::Result<()> {
             import os
 
             os.grantpt(1) # only available on unix, Python 3.13 or newer
-
-            from typing import LiteralString  # added in Python 3.11
             "#,
         ),
     ])?;
@@ -1197,11 +1194,8 @@ fn defaults_to_a_new_python_version() -> anyhow::Result<()> {
     3 |
     4 | os.grantpt(1) # only available on unix, Python 3.13 or newer
       | ^^^^^^^^^^
-    5 |
-    6 | from typing import LiteralString  # added in Python 3.11
       |
-    info: The member may be available on other Python versions or platforms
-    info: Python 3.10 was assumed when resolving the `grantpt` attribute
+    info: Python 3.10 was assumed when accessing `grantpt`
      --> ty.toml:3:18
       |
     2 | [environment]
@@ -1211,26 +1205,7 @@ fn defaults_to_a_new_python_version() -> anyhow::Result<()> {
       |
     info: rule `unresolved-attribute` is enabled by default
 
-    error[unresolved-import]: Module `typing` has no member `LiteralString`
-     --> main.py:6:20
-      |
-    4 | os.grantpt(1) # only available on unix, Python 3.13 or newer
-    5 |
-    6 | from typing import LiteralString  # added in Python 3.11
-      |                    ^^^^^^^^^^^^^
-      |
-    info: The member may be available on other Python versions or platforms
-    info: Python 3.10 was assumed when resolving imports
-     --> ty.toml:3:18
-      |
-    2 | [environment]
-    3 | python-version = "3.10"
-      |                  ^^^^^^ Python 3.10 assumed due to this configuration setting
-    4 | python-platform = "linux"
-      |
-    info: rule `unresolved-import` is enabled by default
-
-    Found 2 diagnostics
+    Found 1 diagnostic
 
     ----- stderr -----
     "#);
@@ -1250,8 +1225,6 @@ fn defaults_to_a_new_python_version() -> anyhow::Result<()> {
             import os
 
             os.grantpt(1) # only available on unix, Python 3.13 or newer
-
-            from typing import LiteralString  # added in Python 3.11
             "#,
         ),
     ])?;

crates/ty/tests/file_watching.rs

@@ -15,7 +15,7 @@ use ty_project::metadata::pyproject::{PyProject, Tool};
 use ty_project::metadata::value::{RangedValue, RelativePathBuf};
 use ty_project::watch::{ChangeEvent, ProjectWatcher, directory_watcher};
 use ty_project::{Db, ProjectDatabase, ProjectMetadata};
-use ty_python_semantic::{Module, ModuleName, PythonPlatform, resolve_module_old};
+use ty_python_semantic::{Module, ModuleName, PythonPlatform, resolve_module};
 
 struct TestCase {
     db: ProjectDatabase,
@@ -232,8 +232,7 @@ impl TestCase {
     }
 
     fn module<'c>(&'c self, name: &str) -> Module<'c> {
-        resolve_module_old(self.db(), &ModuleName::new(name).unwrap())
-            .expect("module to be present")
+        resolve_module(self.db(), &ModuleName::new(name).unwrap()).expect("module to be present")
     }
 
     fn sorted_submodule_names(&self, parent_module_name: &str) -> Vec<String> {
@@ -812,7 +811,7 @@ fn directory_moved_to_project() -> anyhow::Result<()> {
         .with_context(|| "Failed to create __init__.py")?;
     std::fs::write(a_original_path.as_std_path(), "").with_context(|| "Failed to create a.py")?;
 
-    let sub_a_module = resolve_module_old(case.db(), &ModuleName::new_static("sub.a").unwrap());
+    let sub_a_module = resolve_module(case.db(), &ModuleName::new_static("sub.a").unwrap());
 
     assert_eq!(sub_a_module, None);
     case.assert_indexed_project_files([bar]);
@@ -833,7 +832,7 @@ fn directory_moved_to_project() -> anyhow::Result<()> {
         .expect("a.py to exist");
 
     // `import sub.a` should now resolve
-    assert!(resolve_module_old(case.db(), &ModuleName::new_static("sub.a").unwrap()).is_some());
+    assert!(resolve_module(case.db(), &ModuleName::new_static("sub.a").unwrap()).is_some());
 
     case.assert_indexed_project_files([bar, init_file, a_file]);
 
@@ -849,7 +848,7 @@ fn directory_moved_to_trash() -> anyhow::Result<()> {
     ])?;
     let bar = case.system_file(case.project_path("bar.py")).unwrap();
 
-    assert!(resolve_module_old(case.db(), &ModuleName::new_static("sub.a").unwrap()).is_some());
+    assert!(resolve_module(case.db(), &ModuleName::new_static("sub.a").unwrap()).is_some());
 
     let sub_path = case.project_path("sub");
     let init_file = case
@@ -871,7 +870,7 @@ fn directory_moved_to_trash() -> anyhow::Result<()> {
     case.apply_changes(changes, None);
 
     // `import sub.a` should no longer resolve
-    assert!(resolve_module_old(case.db(), &ModuleName::new_static("sub.a").unwrap()).is_none());
+    assert!(resolve_module(case.db(), &ModuleName::new_static("sub.a").unwrap()).is_none());
 
     assert!(!init_file.exists(case.db()));
     assert!(!a_file.exists(case.db()));
@@ -891,8 +890,8 @@ fn directory_renamed() -> anyhow::Result<()> {
 
     let bar = case.system_file(case.project_path("bar.py")).unwrap();
 
-    assert!(resolve_module_old(case.db(), &ModuleName::new_static("sub.a").unwrap()).is_some());
-    assert!(resolve_module_old(case.db(), &ModuleName::new_static("foo.baz").unwrap()).is_none());
+    assert!(resolve_module(case.db(), &ModuleName::new_static("sub.a").unwrap()).is_some());
+    assert!(resolve_module(case.db(), &ModuleName::new_static("foo.baz").unwrap()).is_none());
 
     let sub_path = case.project_path("sub");
     let sub_init = case
@@ -916,9 +915,9 @@ fn directory_renamed() -> anyhow::Result<()> {
     case.apply_changes(changes, None);
 
     // `import sub.a` should no longer resolve
-    assert!(resolve_module_old(case.db(), &ModuleName::new_static("sub.a").unwrap()).is_none());
+    assert!(resolve_module(case.db(), &ModuleName::new_static("sub.a").unwrap()).is_none());
     // `import foo.baz` should now resolve
-    assert!(resolve_module_old(case.db(), &ModuleName::new_static("foo.baz").unwrap()).is_some());
+    assert!(resolve_module(case.db(), &ModuleName::new_static("foo.baz").unwrap()).is_some());
 
     // The old paths are no longer tracked
     assert!(!sub_init.exists(case.db()));
@@ -951,7 +950,7 @@ fn directory_deleted() -> anyhow::Result<()> {
 
     let bar = case.system_file(case.project_path("bar.py")).unwrap();
 
-    assert!(resolve_module_old(case.db(), &ModuleName::new_static("sub.a").unwrap()).is_some());
+    assert!(resolve_module(case.db(), &ModuleName::new_static("sub.a").unwrap()).is_some());
 
     let sub_path = case.project_path("sub");
 
@@ -971,7 +970,7 @@ fn directory_deleted() -> anyhow::Result<()> {
     case.apply_changes(changes, None);
 
     // `import sub.a` should no longer resolve
-    assert!(resolve_module_old(case.db(), &ModuleName::new_static("sub.a").unwrap()).is_none());
+    assert!(resolve_module(case.db(), &ModuleName::new_static("sub.a").unwrap()).is_none());
 
     assert!(!init_file.exists(case.db()));
     assert!(!a_file.exists(case.db()));
@@ -1000,7 +999,7 @@ fn search_path() -> anyhow::Result<()> {
     let site_packages = case.root_path().join("site_packages");
 
     assert_eq!(
-        resolve_module_old(case.db(), &ModuleName::new("a").unwrap()),
+        resolve_module(case.db(), &ModuleName::new("a").unwrap()),
         None
     );
 
@@ -1010,7 +1009,7 @@ fn search_path() -> anyhow::Result<()> {
 
     case.apply_changes(changes, None);
 
-    assert!(resolve_module_old(case.db(), &ModuleName::new_static("a").unwrap()).is_some());
+    assert!(resolve_module(case.db(), &ModuleName::new_static("a").unwrap()).is_some());
     case.assert_indexed_project_files([case.system_file(case.project_path("bar.py")).unwrap()]);
 
     Ok(())
@@ -1023,7 +1022,7 @@ fn add_search_path() -> anyhow::Result<()> {
     let site_packages = case.project_path("site_packages");
     std::fs::create_dir_all(site_packages.as_std_path())?;
 
-    assert!(resolve_module_old(case.db(), &ModuleName::new_static("a").unwrap()).is_none());
+    assert!(resolve_module(case.db(), &ModuleName::new_static("a").unwrap()).is_none());
 
     // Register site-packages as a search path.
     case.update_options(Options {
@@ -1041,7 +1040,7 @@ fn add_search_path() -> anyhow::Result<()> {
 
     case.apply_changes(changes, None);
 
-    assert!(resolve_module_old(case.db(), &ModuleName::new_static("a").unwrap()).is_some());
+    assert!(resolve_module(case.db(), &ModuleName::new_static("a").unwrap()).is_some());
 
     Ok(())
 }
@@ -1173,7 +1172,7 @@ fn changed_versions_file() -> anyhow::Result<()> {
 
     // Unset the custom typeshed directory.
     assert_eq!(
-        resolve_module_old(case.db(), &ModuleName::new("os").unwrap()),
+        resolve_module(case.db(), &ModuleName::new("os").unwrap()),
         None
     );
 
@@ -1188,7 +1187,7 @@ fn changed_versions_file() -> anyhow::Result<()> {
 
     case.apply_changes(changes, None);
 
-    assert!(resolve_module_old(case.db(), &ModuleName::new("os").unwrap()).is_some());
+    assert!(resolve_module(case.db(), &ModuleName::new("os").unwrap()).is_some());
 
     Ok(())
 }
@@ -1411,7 +1410,7 @@ mod unix {
             Ok(())
         })?;
 
-        let baz = resolve_module_old(case.db(), &ModuleName::new_static("bar.baz").unwrap())
+        let baz = resolve_module(case.db(), &ModuleName::new_static("bar.baz").unwrap())
             .expect("Expected bar.baz to exist in site-packages.");
         let baz_project = case.project_path("bar/baz.py");
         let baz_file = baz.file(case.db()).unwrap();
@@ -1487,7 +1486,7 @@ mod unix {
             Ok(())
         })?;
 
-        let baz = resolve_module_old(case.db(), &ModuleName::new_static("bar.baz").unwrap())
+        let baz = resolve_module(case.db(), &ModuleName::new_static("bar.baz").unwrap())
             .expect("Expected bar.baz to exist in site-packages.");
         let baz_file = baz.file(case.db()).unwrap();
         let bar_baz = case.project_path("bar/baz.py");
@@ -1592,7 +1591,7 @@ mod unix {
             Ok(())
         })?;
 
-        let baz = resolve_module_old(case.db(), &ModuleName::new_static("bar.baz").unwrap())
+        let baz = resolve_module(case.db(), &ModuleName::new_static("bar.baz").unwrap())
             .expect("Expected bar.baz to exist in site-packages.");
         let baz_site_packages_path =
             case.project_path(".venv/lib/python3.12/site-packages/bar/baz.py");
@@ -1855,11 +1854,11 @@ fn rename_files_casing_only() -> anyhow::Result<()> {
     let mut case = setup([("lib.py", "class Foo: ...")])?;
 
     assert!(
-        resolve_module_old(case.db(), &ModuleName::new("lib").unwrap()).is_some(),
+        resolve_module(case.db(), &ModuleName::new("lib").unwrap()).is_some(),
         "Expected `lib` module to exist."
     );
     assert_eq!(
-        resolve_module_old(case.db(), &ModuleName::new("Lib").unwrap()),
+        resolve_module(case.db(), &ModuleName::new("Lib").unwrap()),
         None,
         "Expected `Lib` module not to exist"
     );
@@ -1892,13 +1891,13 @@ fn rename_files_casing_only() -> anyhow::Result<()> {
 
     // Resolving `lib` should now fail but `Lib` should now succeed
     assert_eq!(
-        resolve_module_old(case.db(), &ModuleName::new("lib").unwrap()),
+        resolve_module(case.db(), &ModuleName::new("lib").unwrap()),
         None,
         "Expected `lib` module to no longer exist."
     );
 
     assert!(
-        resolve_module_old(case.db(), &ModuleName::new("Lib").unwrap()).is_some(),
+        resolve_module(case.db(), &ModuleName::new("Lib").unwrap()).is_some(),
         "Expected `Lib` module to exist"
     );
 

crates/ty_completion_eval/completion-evaluation-tasks.csv

@@ -18,11 +18,11 @@ numpy-array,main.py,1,1
 object-attr-instance-methods,main.py,0,1
 object-attr-instance-methods,main.py,1,1
 pass-keyword-completion,main.py,0,1
-raise-uses-base-exception,main.py,0,1
+raise-uses-base-exception,main.py,0,2
 scope-existing-over-new-import,main.py,0,1
 scope-prioritize-closer,main.py,0,2
 scope-simple-long-identifier,main.py,0,1
 tstring-completions,main.py,0,1
 ty-extensions-lower-stdlib,main.py,0,8
 type-var-typing-over-ast,main.py,0,3
-type-var-typing-over-ast,main.py,1,278
+type-var-typing-over-ast,main.py,1,279

crates/ty_ide/src/all_symbols.rs

@@ -143,7 +143,7 @@ ABCDEFGHIJKLMNOP = 'https://api.example.com'
 
     impl CursorTest {
         fn all_symbols(&self, query: &str) -> String {
-            let symbols = all_symbols(&self.db, &QueryPattern::fuzzy(query));
+            let symbols = all_symbols(&self.db, &QueryPattern::new(query));
 
             if symbols.is_empty() {
                 return "No symbols found".to_string();

crates/ty_ide/src/code_action.rs

@@ -1,43 +0,0 @@
-use crate::{completion, find_node::covering_node};
-use ruff_db::{files::File, parsed::parsed_module};
-use ruff_diagnostics::Edit;
-use ruff_text_size::TextRange;
-use ty_project::Db;
-use ty_python_semantic::types::UNRESOLVED_REFERENCE;
-
-/// A `QuickFix` Code Action
-#[derive(Debug, Clone)]
-pub struct QuickFix {
-    pub title: String,
-    pub edits: Vec<Edit>,
-    pub preferred: bool,
-}
-
-pub fn code_actions(
-    db: &dyn Db,
-    file: File,
-    diagnostic_range: TextRange,
-    diagnostic_id: &str,
-) -> Option<Vec<QuickFix>> {
-    let registry = db.lint_registry();
-    let Ok(lint_id) = registry.get(diagnostic_id) else {
-        return None;
-    };
-    if lint_id.name() == UNRESOLVED_REFERENCE.name() {
-        let parsed = parsed_module(db, file).load(db);
-        let node = covering_node(parsed.syntax().into(), diagnostic_range).node();
-        let symbol = &node.expr_name()?.id;
-
-        let fixes = completion::missing_imports(db, file, &parsed, symbol, node)
-            .into_iter()
-            .map(|import| QuickFix {
-                title: import.label,
-                edits: vec![import.edit],
-                preferred: true,
-            })
-            .collect();
-        Some(fixes)
-    } else {
-        None
-    }
-}

crates/ty_ide/src/completion.rs

@@ -4,20 +4,19 @@ use ruff_db::files::File;
 use ruff_db::parsed::{ParsedModuleRef, parsed_module};
 use ruff_db::source::source_text;
 use ruff_diagnostics::Edit;
+use ruff_python_ast as ast;
 use ruff_python_ast::name::Name;
-use ruff_python_ast::{self as ast, AnyNodeRef};
 use ruff_python_codegen::Stylist;
 use ruff_python_parser::{Token, TokenAt, TokenKind, Tokens};
 use ruff_text_size::{Ranged, TextLen, TextRange, TextSize};
-use ty_python_semantic::types::UnionType;
 use ty_python_semantic::{
-    Completion as SemanticCompletion, KnownModule, ModuleName, NameKind, SemanticModel,
-    types::{CycleDetector, KnownClass, Type},
+    Completion as SemanticCompletion, ModuleName, NameKind, SemanticModel,
+    types::{CycleDetector, Type},
 };
 
 use crate::docstring::Docstring;
 use crate::find_node::covering_node;
-use crate::goto::Definitions;
+use crate::goto::DefinitionsOrTargets;
 use crate::importer::{ImportRequest, Importer};
 use crate::symbols::QueryPattern;
 use crate::{Db, all_symbols};
@@ -37,9 +36,9 @@ impl<'db> Completions<'db> {
     /// the user has typed as part of the next symbol they are writing.
     /// This collection will treat it as a query when present, and only
     /// add completions that match it.
-    fn fuzzy(db: &'db dyn Db, typed: Option<&str>) -> Completions<'db> {
+    fn new(db: &'db dyn Db, typed: Option<&str>) -> Completions<'db> {
         let query = typed
-            .map(QueryPattern::fuzzy)
+            .map(QueryPattern::new)
             .unwrap_or_else(QueryPattern::matches_all_symbols);
         Completions {
             db,
@@ -48,15 +47,6 @@ impl<'db> Completions<'db> {
         }
     }
 
-    fn exactly(db: &'db dyn Db, symbol: &str) -> Completions<'db> {
-        let query = QueryPattern::exactly(symbol);
-        Completions {
-            db,
-            items: vec![],
-            query,
-        }
-    }
-
     /// Convert this collection into a simple
     /// sequence of completions.
     fn into_completions(mut self) -> Vec<Completion<'db>> {
@@ -66,21 +56,6 @@ impl<'db> Completions<'db> {
         self.items
     }
 
-    fn into_imports(mut self) -> Vec<ImportEdit> {
-        self.items.sort_by(compare_suggestions);
-        self.items
-            .dedup_by(|c1, c2| (&c1.name, c1.module_name) == (&c2.name, c2.module_name));
-        self.items
-            .into_iter()
-            .filter_map(|item| {
-                Some(ImportEdit {
-                    label: format!("import {}.{}", item.module_name?, item.name),
-                    edit: item.import?,
-                })
-            })
-            .collect()
-    }
-
     /// Attempts to adds the given completion to this collection.
     ///
     /// When added, `true` is returned.
@@ -107,31 +82,6 @@ impl<'db> Completions<'db> {
     fn force_add(&mut self, completion: Completion<'db>) {
         self.items.push(completion);
     }
-
-    /// Tags completions with whether they are known to be usable in
-    /// a `raise` context.
-    ///
-    /// It's possible that some completions are usable in a `raise`
-    /// but aren't marked by this method. That is, false negatives are
-    /// possible but false positives are not.
-    fn tag_raisable(&mut self) {
-        let raisable_type = UnionType::from_elements(
-            self.db,
-            [
-                KnownClass::BaseException.to_subclass_of(self.db),
-                KnownClass::BaseException.to_instance(self.db),
-            ],
-        );
-        for item in &mut self.items {
-            let Some(ty) = item.ty else { continue };
-            item.is_definitively_raisable = ty.is_assignable_to(self.db, raisable_type);
-        }
-    }
-
-    /// Removes any completion that doesn't satisfy the given predicate.
-    fn retain(&mut self, predicate: impl FnMut(&Completion<'_>) -> bool) {
-        self.items.retain(predicate);
-    }
 }
 
 impl<'db> Extend<SemanticCompletion<'db>> for Completions<'db> {
@@ -203,13 +153,6 @@ pub struct Completion<'db> {
     /// Whether this item only exists for type checking purposes and
     /// will be missing at runtime
     pub is_type_check_only: bool,
-    /// Whether this item can definitively be used in a `raise` context.
-    ///
-    /// Note that this may not always be computed. (i.e., Only computed
-    /// when we are in a `raise` context.) And also note that if this
-    /// is `true`, then it's definitively usable in `raise`, but if
-    /// it's `false`, it _may_ still be usable in `raise`.
-    pub is_definitively_raisable: bool,
     /// The documentation associated with this item, if
     /// available.
     pub documentation: Option<Docstring>,
@@ -220,7 +163,9 @@ impl<'db> Completion<'db> {
         db: &'db dyn Db,
         semantic: SemanticCompletion<'db>,
     ) -> Completion<'db> {
-        let definition = semantic.ty.and_then(|ty| Definitions::from_ty(db, ty));
+        let definition = semantic
+            .ty
+            .and_then(|ty| DefinitionsOrTargets::from_ty(db, ty));
         let documentation = definition.and_then(|def| def.docstring(db));
         let is_type_check_only = semantic.is_type_check_only(db);
         Completion {
@@ -232,7 +177,6 @@ impl<'db> Completion<'db> {
             import: None,
             builtin: semantic.builtin,
             is_type_check_only,
-            is_definitively_raisable: false,
             documentation,
         }
     }
@@ -313,7 +257,6 @@ impl<'db> Completion<'db> {
             import: None,
             builtin: false,
             is_type_check_only: false,
-            is_definitively_raisable: false,
             documentation: None,
         }
     }
@@ -328,7 +271,6 @@ impl<'db> Completion<'db> {
             import: None,
             builtin: true,
             is_type_check_only: false,
-            is_definitively_raisable: false,
             documentation: None,
         }
     }
@@ -391,7 +333,7 @@ pub fn completion<'db>(
         return vec![];
     }
 
-    let mut completions = Completions::fuzzy(db, typed.as_deref());
+    let mut completions = Completions::new(db, typed.as_deref());
 
     if let Some(import) = ImportStatement::detect(db, file, &parsed, tokens, typed.as_deref()) {
         import.add_completions(db, file, &mut completions);
@@ -422,42 +364,9 @@ pub fn completion<'db>(
         }
     }
 
-    if is_raising_exception(tokens) {
-        completions.tag_raisable();
-
-        // As a special case, and because it's a common footgun, we
-        // specifically disallow `NotImplemented` in this context.
-        // `NotImplementedError` should be used instead. So if we can
-        // definitively detect `NotImplemented`, then we can safely
-        // omit it from suggestions.
-        completions.retain(|item| {
-            let Some(ty) = item.ty else { return true };
-            !ty.is_notimplemented(db)
-        });
-    }
-
     completions.into_completions()
 }
 
-pub(crate) struct ImportEdit {
-    pub label: String,
-    pub edit: Edit,
-}
-
-pub(crate) fn missing_imports(
-    db: &dyn Db,
-    file: File,
-    parsed: &ParsedModuleRef,
-    symbol: &str,
-    node: AnyNodeRef,
-) -> Vec<ImportEdit> {
-    let mut completions = Completions::exactly(db, symbol);
-    let scoped = ScopedTarget { node };
-    add_unimported_completions(db, file, parsed, scoped, &mut completions);
-
-    completions.into_imports()
-}
-
 /// Adds completions derived from keywords.
 ///
 /// This should generally only be used when offering "scoped" completions.
@@ -518,8 +427,7 @@ fn add_unimported_completions<'db>(
     let members = importer.members_in_scope_at(scoped.node, scoped.node.start());
 
     for symbol in all_symbols(db, &completions.query) {
-        if symbol.module.file(db) == Some(file) || symbol.module.is_known(db, KnownModule::Builtins)
-        {
+        if symbol.module.file(db) == Some(file) {
             continue;
         }
 
@@ -542,7 +450,6 @@ fn add_unimported_completions<'db>(
             builtin: false,
             // TODO: `is_type_check_only` requires inferring the type of the symbol
             is_type_check_only: false,
-            is_definitively_raisable: false,
             documentation: None,
         });
     }
@@ -1356,8 +1263,7 @@ fn find_typed_text(
     if last.end() < offset || last.range().is_empty() {
         return None;
     }
-    let range = TextRange::new(last.start(), offset);
-    Some(source[range].to_string())
+    Some(source[last.range()].to_string())
 }
 
 /// Whether the last token is in a place where we should not provide completions.
@@ -1448,52 +1354,10 @@ fn is_in_variable_binding(parsed: &ParsedModuleRef, offset: TextSize, typed: Opt
             type_param.name.range.contains_range(range)
         }
         ast::AnyNodeRef::StmtFor(stmt_for) => stmt_for.target.range().contains_range(range),
-        // The AST does not produce `ast::AnyNodeRef::Parameter` nodes for keywords
-        // or otherwise invalid syntax. Rather they are captured in a
-        // `ast::AnyNodeRef::Parameters` node as "empty space". To ensure
-        // we still suppress suggestions even when the syntax is technically
-        // invalid we extract the token under the cursor and check if it makes
-        // up that "empty space" inside the Parameters Node. If it does, we know
-        // that we are still binding variables, just that the current state is
-        // syntatically invalid. Hence we suppress autocomplete suggestons
-        // also in those cases.
-        ast::AnyNodeRef::Parameters(params) => {
-            if !params.range.contains_range(range) {
-                return false;
-            }
-            params
-                .iter()
-                .map(|param| param.range())
-                .all(|r| !r.contains_range(range))
-        }
         _ => false,
     })
 }
 
-/// Returns true when the cursor is after a `raise` keyword.
-fn is_raising_exception(tokens: &[Token]) -> bool {
-    /// The maximum number of tokens we're willing to
-    /// look-behind to find a `raise` keyword.
-    const LIMIT: usize = 10;
-
-    // This only looks for things like `raise foo.bar.baz.qu<CURSOR>`.
-    // Technically, any kind of expression is allowed after `raise`.
-    // But we may not always want to treat it specially. So we're
-    // rather conservative about what we consider "raising an
-    // exception" to be for the purposes of completions. The failure
-    // mode here is that we may wind up suggesting things that
-    // shouldn't be raised. The benefit is that when this heuristic
-    // does work, we won't suggest things that shouldn't be raised.
-    for token in tokens.iter().rev().take(LIMIT) {
-        match token.kind() {
-            TokenKind::Name | TokenKind::Dot => continue,
-            TokenKind::Raise => return true,
-            _ => return false,
-        }
-    }
-    false
-}
-
 /// Order completions according to the following rules:
 ///
 /// 1) Names with no underscore prefix
@@ -1506,16 +1370,8 @@ fn is_raising_exception(tokens: &[Token]) -> bool {
 /// This has the effect of putting all dunder attributes after "normal"
 /// attributes, and all single-underscore attributes after dunder attributes.
 fn compare_suggestions(c1: &Completion, c2: &Completion) -> Ordering {
-    fn key<'a>(completion: &'a Completion) -> (bool, bool, bool, bool, NameKind, bool, &'a Name) {
+    fn key<'a>(completion: &'a Completion) -> (bool, bool, bool, NameKind, bool, &'a Name) {
         (
-            // This is only true when we are both in a `raise` context
-            // *and* we know this suggestion is definitively usable
-            // in a `raise` context. So we should sort these before
-            // anything else.
-            !completion.is_definitively_raisable,
-            // When `None`, a completion is for something in the
-            // current module, which we should generally prefer over
-            // something from outside the module.
             completion.module_name.is_some(),
             // At time of writing (2025-11-11), keyword completions
             // are classified as builtins, which makes them sort after
@@ -1693,21 +1549,6 @@ mod tests {
         );
     }
 
-    #[test]
-    fn inside_token() {
-        let test = completion_test_builder(
-            "\
-foo_bar_baz = 1
-x = foo<CURSOR>bad
-",
-        );
-
-        assert_snapshot!(
-            test.skip_builtins().build().snapshot(),
-            @"foo_bar_baz",
-        );
-    }
-
     #[test]
     fn type_keyword_dedup() {
         let test = completion_test_builder(
@@ -2896,7 +2737,7 @@ Answer.<CURSOR>
                 __itemsize__ :: int
                 __iter__ :: bound method <class 'Answer'>.__iter__[_EnumMemberT]() -> Iterator[_EnumMemberT@__iter__]
                 __len__ :: bound method <class 'Answer'>.__len__() -> int
-                __members__ :: MappingProxyType[str, Answer]
+                __members__ :: MappingProxyType[str, Unknown]
                 __module__ :: str
                 __mro__ :: tuple[type, ...]
                 __name__ :: str
@@ -5422,45 +5263,6 @@ def foo(p<CURSOR>
         );
     }
 
-    #[test]
-    fn no_completions_in_function_param_keyword() {
-        let builder = completion_test_builder(
-            "\
-def foo(in<CURSOR>
-",
-        );
-        assert_snapshot!(
-            builder.build().snapshot(),
-            @"<No completions found>",
-        );
-    }
-
-    #[test]
-    fn no_completions_in_function_param_multi_keyword() {
-        let builder = completion_test_builder(
-            "\
-def foo(param, in<CURSOR>
-",
-        );
-        assert_snapshot!(
-            builder.build().snapshot(),
-            @"<No completions found>",
-        );
-    }
-
-    #[test]
-    fn no_completions_in_function_param_multi_keyword_middle() {
-        let builder = completion_test_builder(
-            "\
-def foo(param, in<CURSOR>, param_two
-",
-        );
-        assert_snapshot!(
-            builder.build().snapshot(),
-            @"<No completions found>",
-        );
-    }
-
     #[test]
     fn no_completions_in_function_type_param() {
         let builder = completion_test_builder(

crates/ty_ide/src/doc_highlights.rs

@@ -3,7 +3,6 @@ use crate::references::{ReferencesMode, references};
 use crate::{Db, ReferenceTarget};
 use ruff_db::files::File;
 use ruff_text_size::TextSize;
-use ty_python_semantic::SemanticModel;
 
 /// Find all document highlights for a symbol at the given position.
 /// Document highlights are limited to the current file only.
@@ -14,10 +13,9 @@ pub fn document_highlights(
 ) -> Option<Vec<ReferenceTarget>> {
     let parsed = ruff_db::parsed::parsed_module(db, file);
     let module = parsed.load(db);
-    let model = SemanticModel::new(db, file);
 
     // Get the definitions for the symbol at the cursor position
-    let goto_target = find_goto_target(&model, &module, offset)?;
+    let goto_target = find_goto_target(&module, offset)?;
 
     // Use DocumentHighlights mode which limits search to current file only
     references(db, file, &goto_target, ReferencesMode::DocumentHighlights)

crates/ty_ide/src/docstring.rs

@@ -182,11 +182,6 @@ fn documentation_trim(docs: &str) -> String {
 /// </code>
 /// ```
 fn render_markdown(docstring: &str) -> String {
-    // Here lies a monumemnt to robust parsing and escaping:
-    // a codefence with SO MANY backticks that surely no one will ever accidentally
-    // break out of it, even if they're writing python documentation about markdown
-    // code fences and are showing off how you can use more than 3 backticks.
-    const FENCE: &str = "```````````";
     // TODO: there is a convention that `singletick` is for items that can
     // be looked up in-scope while ``multitick`` is for opaque inline code.
     // While rendering this we should make note of all the `singletick` locations
@@ -196,10 +191,9 @@ fn render_markdown(docstring: &str) -> String {
     let mut first_line = true;
     let mut block_indent = 0;
     let mut in_doctest = false;
-    let mut starting_literal = None;
+    let mut starting_literal = false;
     let mut in_literal = false;
     let mut in_any_code = false;
-    let mut temp_owned_line;
     for untrimmed_line in docstring.lines() {
         // We can assume leading whitespace has been normalized
         let mut line = untrimmed_line.trim_start_matches(' ');
@@ -213,7 +207,7 @@ fn render_markdown(docstring: &str) -> String {
                 output.push_str("  ");
             }
             // Only push newlines if we're not scanning for a real line
-            if starting_literal.is_none() {
+            if !starting_literal {
                 output.push('\n');
             }
         }
@@ -225,23 +219,21 @@ fn render_markdown(docstring: &str) -> String {
             in_literal = false;
             in_any_code = false;
             block_indent = 0;
-            output.push_str(FENCE);
-            output.push('\n');
+            output.push_str("```\n");
         }
 
         // We previously entered a literal block and we just found our first non-blank line
         // So now we're actually in the literal block
-        if let Some(literal) = starting_literal
-            && !line.is_empty()
-        {
-            starting_literal = None;
+        if starting_literal && !line.is_empty() {
+            starting_literal = false;
             in_literal = true;
             in_any_code = true;
             block_indent = line_indent;
-            output.push('\n');
-            output.push_str(FENCE);
-            output.push_str(literal);
-            output.push('\n');
+            // TODO: I hope people don't have literal blocks about markdown code fence syntax
+            // TODO: should we not be this aggressive? Let it autodetect?
+            // TODO: respect `.. code-block::` directives:
+            // <https://www.sphinx-doc.org/en/master/usage/restructuredtext/directives.html#directive-code-block>
+            output.push_str("\n```python\n");
         }
 
         // If we're not in a codeblock and we see something that signals a doctest, start one
@@ -250,79 +242,25 @@ fn render_markdown(docstring: &str) -> String {
             in_doctest = true;
             in_any_code = true;
             // TODO: is there something more specific? `pycon`?
-            output.push_str(FENCE);
-            output.push_str("python\n");
+            output.push_str("```python\n");
         }
 
         // If we're not in a codeblock and we see something that signals a literal block, start one
-        let parsed_lit = line
-            // first check for a line ending with `::`
-            .strip_suffix("::")
-            .map(|prefix| (prefix, None))
-            // if that fails, look for a line ending with `:: lang`
-            .or_else(|| {
-                let (prefix, lang) = line.rsplit_once(' ')?;
-                let prefix = prefix.trim_end().strip_suffix("::")?;
-                Some((prefix, Some(lang)))
-            });
-        if !in_any_code && let Some((without_lit, lang)) = parsed_lit {
-            let mut without_directive = without_lit;
-            let mut directive = None;
-            // Parse out a directive like `.. warning::`
-            if let Some((prefix, directive_str)) = without_lit.rsplit_once(' ')
-                && let Some(without_directive_str) = prefix.strip_suffix("..")
-            {
-                directive = Some(directive_str);
-                without_directive = without_directive_str;
-            }
-
-            // Whether the `::` should become `:` or be erased
-            let include_colon = if let Some(character) = without_directive.chars().next_back() {
-                // If lang is set then we're either deleting the whole line or
-                // the special rendering below will add it itself
-                lang.is_none() && !character.is_whitespace()
+        if !in_any_code && let Some(without_lit) = line.strip_suffix("::") {
+            let trimmed_without_lit = without_lit.trim();
+            if let Some(character) = trimmed_without_lit.chars().next_back() {
+                if character.is_whitespace() {
+                    // Remove the marker completely
+                    line = trimmed_without_lit;
+                } else {
+                    // Only remove the first `:`
+                    line = line.strip_suffix(":").unwrap();
+                }
             } else {
                 // Delete whole line
-                false
-            };
-
-            if include_colon {
-                line = line.strip_suffix(":").unwrap();
-            } else {
-                line = without_directive.trim_end();
+                line = trimmed_without_lit;
             }
-
-            starting_literal = match directive {
-                // Special directives that should be plaintext
-                Some(
-                    "attention" | "caution" | "danger" | "error" | "hint" | "important" | "note"
-                    | "tip" | "warning" | "admonition" | "versionadded" | "version-added"
-                    | "versionchanged" | "version-changed" | "version-deprecated" | "deprecated"
-                    | "version-removed" | "versionremoved",
-                ) => {
-                    // Render the argument of things like `.. version-added:: 4.0`
-                    let suffix = if let Some(lang) = lang {
-                        format!(" *{lang}*")
-                    } else {
-                        String::new()
-                    };
-                    // We prepend without_directive here out of caution for preserving input.
-                    // This is probably gibberish/invalid syntax? But it's a no-op in normal cases.
-                    temp_owned_line =
-                        format!("**{without_directive}{}:**{suffix}", directive.unwrap());
-
-                    line = temp_owned_line.as_str();
-                    None
-                }
-                // Things that just mean "it's code"
-                Some(
-                    "code-block" | "sourcecode" | "code" | "testcode" | "testsetup" | "testcleanup",
-                ) => lang.or(Some("python")),
-                // Unknown (python I guess?)
-                Some(_) => lang.or(Some("python")),
-                // default to python
-                None => lang.or(Some("python")),
-            };
+            starting_literal = true;
         }
 
         // Add this line's indentation.
@@ -411,7 +349,7 @@ fn render_markdown(docstring: &str) -> String {
                 block_indent = 0;
                 in_any_code = false;
                 in_literal = false;
-                output.push_str(FENCE);
+                output.push_str("```");
             }
         } else {
             // Print the line verbatim, it's in code
@@ -422,8 +360,7 @@ fn render_markdown(docstring: &str) -> String {
     }
     // Flush codeblock
     if in_any_code {
-        output.push('\n');
-        output.push_str(FENCE);
+        output.push_str("\n```");
     }
 
     output
@@ -793,6 +730,28 @@ mod tests {
 
         let docstring = Docstring::new(docstring.to_owned());
 
+        assert_snapshot!(docstring.render_plaintext(), @r"
+        Here _this_ and ___that__ should be escaped
+        Here *this* and **that** should be untouched
+        Here `this` and ``that`` should be untouched
+
+        Here `_this_` and ``__that__`` should be untouched
+        Here `_this_` ``__that__`` should be untouched
+        `_this_too_should_be_untouched_`
+
+        Here `_this_```__that__`` should be untouched but this_is_escaped
+        Here ``_this_```__that__` should be untouched but this_is_escaped
+
+        Here `_this_ and _that_ should be escaped (but isn't)
+        Here _this_ and _that_` should be escaped
+        `Here _this_ and _that_ should be escaped (but isn't)
+        Here _this_ and _that_ should be escaped`
+
+        Here ```_is_``__a__`_balanced_``_mess_```
+        Here ```_is_`````__a__``_random_````_mess__````
+        ```_is_`````__a__``_random_````_mess__````
+        ");
+
         assert_snapshot!(docstring.render_markdown(), @r"
         Here \_this\_ and \_\_\_that\_\_ should be escaped  
         Here *this* and **that** should be untouched  
@@ -837,9 +796,9 @@ mod tests {
 
         let docstring = Docstring::new(docstring.to_owned());
 
-        assert_snapshot!(docstring.render_markdown(), @r#"
-        Check out this great example code:    
-        ```````````python
+        assert_snapshot!(docstring.render_plaintext(), @r#"
+        Check out this great example code::
+
             x_y = "hello"
 
             if len(x_y) > 4:
@@ -849,7 +808,22 @@ mod tests {
 
             print("done")
 
-        ```````````
+        You love to see it.
+        "#);
+
+        assert_snapshot!(docstring.render_markdown(), @r#"
+        Check out this great example code:    
+        ```python
+            x_y = "hello"
+
+            if len(x_y) > 4:
+                print(x_y)
+            else:
+                print("too short :(")
+
+            print("done")
+
+        ```
         You love to see it.
         "#);
     }
@@ -875,9 +849,9 @@ mod tests {
 
         let docstring = Docstring::new(docstring.to_owned());
 
-        assert_snapshot!(docstring.render_markdown(), @r#"
-        Check out this great example code    
-        ```````````python
+        assert_snapshot!(docstring.render_plaintext(), @r#"
+        Check out this great example code ::
+
             x_y = "hello"
 
             if len(x_y) > 4:
@@ -887,7 +861,22 @@ mod tests {
 
             print("done")
 
-        ```````````
+        You love to see it.
+        "#);
+
+        assert_snapshot!(docstring.render_markdown(), @r#"
+        Check out this great example code :    
+        ```python
+            x_y = "hello"
+
+            if len(x_y) > 4:
+                print(x_y)
+            else:
+                print("too short :(")
+
+            print("done")
+
+        ```
         You love to see it.
         "#);
     }
@@ -914,10 +903,10 @@ mod tests {
 
         let docstring = Docstring::new(docstring.to_owned());
 
-        assert_snapshot!(docstring.render_markdown(), @r#"
-        Check out this great example code  
-        &nbsp;&nbsp;&nbsp;&nbsp;    
-        ```````````python
+        assert_snapshot!(docstring.render_plaintext(), @r#"
+        Check out this great example code
+            ::
+
             x_y = "hello"
 
             if len(x_y) > 4:
@@ -927,7 +916,23 @@ mod tests {
 
             print("done")
 
-        ```````````
+        You love to see it.
+        "#);
+
+        assert_snapshot!(docstring.render_markdown(), @r#"
+        Check out this great example code  
+        &nbsp;&nbsp;&nbsp;&nbsp;    
+        ```python
+            x_y = "hello"
+
+            if len(x_y) > 4:
+                print(x_y)
+            else:
+                print("too short :(")
+
+            print("done")
+
+        ```
         You love to see it.
         "#);
     }
@@ -951,9 +956,8 @@ mod tests {
 
         let docstring = Docstring::new(docstring.to_owned());
 
-        assert_snapshot!(docstring.render_markdown(), @r#"
-        Check out this great example code:  
-        ```````````python
+        assert_snapshot!(docstring.render_plaintext(), @r#"
+        Check out this great example code::
             x_y = "hello"
 
             if len(x_y) > 4:
@@ -962,7 +966,21 @@ mod tests {
                 print("too short :(")
 
             print("done")
-        ```````````
+        You love to see it.
+        "#);
+
+        assert_snapshot!(docstring.render_markdown(), @r#"
+        Check out this great example code:  
+        ```python
+            x_y = "hello"
+
+            if len(x_y) > 4:
+                print(x_y)
+            else:
+                print("too short :(")
+
+            print("done")
+        ```
         You love to see it.
         "#);
     }
@@ -985,9 +1003,9 @@ mod tests {
 
         let docstring = Docstring::new(docstring.to_owned());
 
-        assert_snapshot!(docstring.render_markdown(), @r#"
-        Check out this great example code:    
-        ```````````python
+        assert_snapshot!(docstring.render_plaintext(), @r#"
+        Check out this great example code::
+
             x_y = "hello"
 
             if len(x_y) > 4:
@@ -996,224 +1014,20 @@ mod tests {
                 print("too short :(")
 
             print("done")
-        ```````````
         "#);
-    }
-
-    // `warning` and several other directives are special languages that should actually
-    // still be shown as text and not ```code```.
-    #[test]
-    fn warning_block() {
-        let docstring = r#"
-        The thing you need to understand is that computers are hard.
-
-        .. warning::
-            Now listen here buckaroo you might have seen me say computers are hard,
-            and though "yeah I know computers are hard but NO you DON'T KNOW.
-
-            Listen:
-
-            - Computers
-            - Are
-            - Hard
-
-            Ok!?!?!?
-        "#;
-
-        let docstring = Docstring::new(docstring.to_owned());
 
         assert_snapshot!(docstring.render_markdown(), @r#"
-        The thing you need to understand is that computers are hard.  
-          
-        **warning:**  
-        &nbsp;&nbsp;&nbsp;&nbsp;Now listen here buckaroo you might have seen me say computers are hard,  
-        &nbsp;&nbsp;&nbsp;&nbsp;and though "yeah I know computers are hard but NO you DON'T KNOW.  
-          
-        &nbsp;&nbsp;&nbsp;&nbsp;Listen:  
-          
-        &nbsp;&nbsp;&nbsp;&nbsp;- Computers  
-        &nbsp;&nbsp;&nbsp;&nbsp;- Are  
-        &nbsp;&nbsp;&nbsp;&nbsp;- Hard  
-          
-        &nbsp;&nbsp;&nbsp;&nbsp;Ok!?!?!?
-        "#);
-    }
+        Check out this great example code:    
+        ```python
+            x_y = "hello"
 
-    // `warning` and several other directives are special languages that should actually
-    // still be shown as text and not ```code```.
-    #[test]
-    fn version_blocks() {
-        let docstring = r#"
-        Some much-updated docs
+            if len(x_y) > 4:
+                print(x_y)
+            else:
+                print("too short :(")
 
-        .. version-added:: 3.0
-           Function added
-
-        .. version-changed:: 4.0
-           The `spam` argument was added
-        .. version-changed:: 4.1
-           The `spam` argument is considered evil now.
-
-           You really shouldnt use it
-
-        And that's the docs
-        "#;
-
-        let docstring = Docstring::new(docstring.to_owned());
-
-        assert_snapshot!(docstring.render_markdown(), @r"
-        Some much-updated docs  
-          
-        **version-added:** *3.0*  
-        &nbsp;&nbsp;&nbsp;Function added  
-          
-        **version-changed:** *4.0*  
-        &nbsp;&nbsp;&nbsp;The `spam` argument was added  
-        **version-changed:** *4.1*  
-        &nbsp;&nbsp;&nbsp;The `spam` argument is considered evil now.  
-          
-        &nbsp;&nbsp;&nbsp;You really shouldnt use it  
-          
-        And that's the docs
-        ");
-    }
-
-    // I don't know if this is valid syntax but we preserve stuff before non-code blocks like
-    // `..deprecated ::`
-    #[test]
-    fn deprecated_prefix_gunk() {
-        let docstring = r#"
-        wow this is some changes .. deprecated:: 1.2.3
-            x = 2
-        "#;
-
-        let docstring = Docstring::new(docstring.to_owned());
-
-        assert_snapshot!(docstring.render_markdown(), @r"
-        **wow this is some changes deprecated:** *1.2.3*  
-        &nbsp;&nbsp;&nbsp;&nbsp;x = 2
-        ");
-    }
-
-    // `.. code::` is a literal block and the `.. code::` should be deleted
-    #[test]
-    fn code_block() {
-        let docstring = r#"
-        Here's some code!
-
-        .. code::
-            def main() {
-                print("hello world!")
-            }
-        "#;
-
-        let docstring = Docstring::new(docstring.to_owned());
-
-        assert_snapshot!(docstring.render_markdown(), @r#"
-        Here's some code!  
-          
-          
-        ```````````python
-            def main() {
-                print("hello world!")
-            }
-        ```````````
-        "#);
-    }
-
-    // `.. code:: rust` is a literal block with rust syntax highlighting
-    #[test]
-    fn code_block_lang() {
-        let docstring = r#"
-        Here's some Rust code!
-
-        .. code:: rust
-            fn main() {
-                println!("hello world!");
-            }
-        "#;
-
-        let docstring = Docstring::new(docstring.to_owned());
-
-        assert_snapshot!(docstring.render_markdown(), @r#"
-        Here's some Rust code!  
-          
-          
-        ```````````rust
-            fn main() {
-                println!("hello world!");
-            }
-        ```````````
-        "#);
-    }
-
-    // I don't know if this is valid syntax but we preserve stuff before `..code ::`
-    #[test]
-    fn code_block_prefix_gunk() {
-        let docstring = r#"
-        wow this is some code.. code:: abc
-            x = 2
-        "#;
-
-        let docstring = Docstring::new(docstring.to_owned());
-
-        assert_snapshot!(docstring.render_markdown(), @r"
-        wow this is some code  
-        ```````````abc
-            x = 2
-        ```````````
-        ");
-    }
-
-    // `.. asdgfhjkl-unknown::` is treated the same as `.. code::`
-    #[test]
-    fn unknown_block() {
-        let docstring = r#"
-        Here's some code!
-
-        .. asdgfhjkl-unknown::
-            fn main() {
-                println!("hello world!");
-            }
-        "#;
-
-        let docstring = Docstring::new(docstring.to_owned());
-
-        assert_snapshot!(docstring.render_markdown(), @r#"
-        Here's some code!  
-          
-          
-        ```````````python
-            fn main() {
-                println!("hello world!");
-            }
-        ```````````
-        "#);
-    }
-
-    // `.. asdgfhjkl-unknown:: rust` is treated the same as `.. code:: rust`
-    #[test]
-    fn unknown_block_lang() {
-        let docstring = r#"
-        Here's some Rust code!
-
-        .. asdgfhjkl-unknown::   rust
-            fn main() {
-                print("hello world!")
-            }
-        "#;
-
-        let docstring = Docstring::new(docstring.to_owned());
-
-        assert_snapshot!(docstring.render_markdown(), @r#"
-        Here's some Rust code!  
-          
-          
-        ```````````rust
-            fn main() {
-                print("hello world!")
-            }
-        ```````````
+            print("done")
+        ```
         "#);
     }
 
@@ -1233,15 +1047,26 @@ mod tests {
 
         let docstring = Docstring::new(docstring.to_owned());
 
-        assert_snapshot!(docstring.render_markdown(), @r"
-        This is a function description  
-          
-        ```````````python
+        assert_snapshot!(docstring.render_plaintext(), @r"
+        This is a function description
+
         >>> thing.do_thing()
         wow it did the thing
         >>> thing.do_other_thing()
         it sure did the thing
-        ```````````  
+
+        As you can see it did the thing!
+        ");
+
+        assert_snapshot!(docstring.render_markdown(), @r"
+        This is a function description  
+          
+        ```python
+        >>> thing.do_thing()
+        wow it did the thing
+        >>> thing.do_other_thing()
+        it sure did the thing
+        ```  
         As you can see it did the thing!
         ");
     }
@@ -1262,15 +1087,26 @@ mod tests {
 
         let docstring = Docstring::new(docstring.to_owned());
 
-        assert_snapshot!(docstring.render_markdown(), @r"
-        This is a function description  
-          
-        ```````````python
+        assert_snapshot!(docstring.render_plaintext(), @r"
+        This is a function description
+
             >>> thing.do_thing()
             wow it did the thing
             >>> thing.do_other_thing()
             it sure did the thing
-        ```````````  
+
+        As you can see it did the thing!
+        ");
+
+        assert_snapshot!(docstring.render_markdown(), @r"
+        This is a function description  
+          
+        ```python
+            >>> thing.do_thing()
+            wow it did the thing
+            >>> thing.do_other_thing()
+            it sure did the thing
+        ```  
         As you can see it did the thing!
         ");
     }
@@ -1285,13 +1121,20 @@ mod tests {
 
         let docstring = Docstring::new(docstring.to_owned());
 
-        assert_snapshot!(docstring.render_markdown(), @r"
-        ```````````python
+        assert_snapshot!(docstring.render_plaintext(), @r"
         >>> thing.do_thing()
         wow it did the thing
         >>> thing.do_other_thing()
         it sure did the thing
-        ```````````
+        ");
+
+        assert_snapshot!(docstring.render_markdown(), @r"
+        ```python
+        >>> thing.do_thing()
+        wow it did the thing
+        >>> thing.do_other_thing()
+        it sure did the thing
+        ```
         ");
     }
 
@@ -1311,15 +1154,26 @@ mod tests {
 
         let docstring = Docstring::new(docstring.to_owned());
 
-        assert_snapshot!(docstring.render_markdown(), @r"
-        This is a function description:    
-        ```````````python
+        assert_snapshot!(docstring.render_plaintext(), @r"
+        This is a function description::
+
             >>> thing.do_thing()
             wow it did the thing
             >>> thing.do_other_thing()
             it sure did the thing
 
-        ```````````
+        As you can see it did the thing!
+        ");
+
+        assert_snapshot!(docstring.render_markdown(), @r"
+        This is a function description:    
+        ```python
+            >>> thing.do_thing()
+            wow it did the thing
+            >>> thing.do_other_thing()
+            it sure did the thing
+
+        ```
         As you can see it did the thing!
         ");
     }
@@ -1335,14 +1189,22 @@ mod tests {
 
         let docstring = Docstring::new(docstring.to_owned());
 
-        assert_snapshot!(docstring.render_markdown(), @r"
-        And so you can see that  
-        ```````````python
+        assert_snapshot!(docstring.render_plaintext(), @r"
+        And so you can see that
             >>> thing.do_thing()
             wow it did the thing
             >>> thing.do_other_thing()
             it sure did the thing
-        ```````````
+        ");
+
+        assert_snapshot!(docstring.render_markdown(), @r"
+        And so you can see that  
+        ```python
+            >>> thing.do_thing()
+            wow it did the thing
+            >>> thing.do_other_thing()
+            it sure did the thing
+        ```
         ");
     }
 
@@ -1521,14 +1383,14 @@ mod tests {
         &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;This is a continuation of param2 description.  
         'param3' -- A parameter without type annotation  
           
-        ```````````python
+        ```python
         >>> print repr(foo.__doc__)
         '\n    This is the second line of the docstring.\n    '
         >>> foo.__doc__.splitlines()
         ['', '    This is the second line of the docstring.', '    ']
         >>> trim(foo.__doc__)
         'This is the second line of the docstring.'
-        ```````````
+        ```
         ");
     }
 

crates/ty_ide/src/goto.rs

@@ -61,7 +61,6 @@ pub(crate) enum GotoTarget<'a> {
     /// ```
     ImportModuleComponent {
         module_name: String,
-        level: u32,
         component_index: usize,
         component_range: TextRange,
     },
@@ -190,31 +189,20 @@ pub(crate) enum GotoTarget<'a> {
         /// The call of the callable
         call: &'a ast::ExprCall,
     },
-
-    /// Go to on a sub-expression of a string annotation's sub-AST
-    ///
-    /// ```py
-    /// x: "int | None"
-    ///           ^^^^
-    /// ```
-    ///
-    /// This is equivalent to `GotoTarget::Expression` but the expression
-    /// isn't actually in the AST.
-    StringAnnotationSubexpr {
-        /// The string literal that is a string annotation.
-        string_expr: &'a ast::ExprStringLiteral,
-        /// The range to query in the sub-AST for the sub-expression.
-        subrange: TextRange,
-        /// If the expression is a Name of some kind this is the name (just a cached result).
-        name: Option<String>,
-    },
 }
 
 /// The resolved definitions for a `GotoTarget`
 #[derive(Debug, Clone)]
-pub(crate) struct Definitions<'db>(pub Vec<ResolvedDefinition<'db>>);
+pub(crate) enum DefinitionsOrTargets<'db> {
+    /// We computed actual Definitions we can do followup queries on.
+    Definitions(Vec<ResolvedDefinition<'db>>),
+    /// We directly computed a navigation.
+    ///
+    /// We can't get docs or usefully compute goto-definition for this.
+    Targets(crate::NavigationTargets),
+}
 
-impl<'db> Definitions<'db> {
+impl<'db> DefinitionsOrTargets<'db> {
     pub(crate) fn from_ty(db: &'db dyn crate::Db, ty: Type<'db>) -> Option<Self> {
         let ty_def = ty.definition(db)?;
         let resolved = match ty_def {
@@ -230,7 +218,7 @@ impl<'db> Definitions<'db> {
                 ResolvedDefinition::Definition(definition)
             }
         };
-        Some(Definitions(vec![resolved]))
+        Some(DefinitionsOrTargets::Definitions(vec![resolved]))
     }
 
     /// Get the "goto-declaration" interpretation of this definition
@@ -238,9 +226,14 @@ impl<'db> Definitions<'db> {
     /// In this case it basically returns exactly what was found.
     pub(crate) fn declaration_targets(
         self,
-        db: &'db dyn ty_python_semantic::Db,
+        db: &'db dyn crate::Db,
     ) -> Option<crate::NavigationTargets> {
-        definitions_to_navigation_targets(db, None, self.0)
+        match self {
+            DefinitionsOrTargets::Definitions(definitions) => {
+                definitions_to_navigation_targets(db, None, definitions)
+            }
+            DefinitionsOrTargets::Targets(targets) => Some(targets),
+        }
     }
 
     /// Get the "goto-definition" interpretation of this definition
@@ -249,9 +242,14 @@ impl<'db> Definitions<'db> {
     /// if the definition we have is found in a stub file.
     pub(crate) fn definition_targets(
         self,
-        db: &'db dyn ty_python_semantic::Db,
+        db: &'db dyn crate::Db,
     ) -> Option<crate::NavigationTargets> {
-        definitions_to_navigation_targets(db, Some(&StubMapper::new(db)), self.0)
+        match self {
+            DefinitionsOrTargets::Definitions(definitions) => {
+                definitions_to_navigation_targets(db, Some(&StubMapper::new(db)), definitions)
+            }
+            DefinitionsOrTargets::Targets(targets) => Some(targets),
+        }
     }
 
     /// Get the docstring for this definition
@@ -260,7 +258,13 @@ impl<'db> Definitions<'db> {
     /// so this will check both the goto-declarations and goto-definitions (in that order)
     /// and return the first one found.
     pub(crate) fn docstring(self, db: &'db dyn crate::Db) -> Option<Docstring> {
-        for definition in &self.0 {
+        let definitions = match self {
+            DefinitionsOrTargets::Definitions(definitions) => definitions,
+            // Can't find docs for these
+            // (make more cases DefinitionOrTargets::Definitions to get more docs!)
+            DefinitionsOrTargets::Targets(_) => return None,
+        };
+        for definition in &definitions {
             // If we got a docstring from the original definition, use it
             if let Some(docstring) = definition.docstring(db) {
                 return Some(Docstring::new(docstring));
@@ -273,7 +277,7 @@ impl<'db> Definitions<'db> {
         let stub_mapper = StubMapper::new(db);
 
         // Try to find the corresponding implementation definition
-        for definition in stub_mapper.map_definitions(self.0) {
+        for definition in stub_mapper.map_definitions(definitions) {
             if let Some(docstring) = definition.docstring(db) {
                 return Some(Docstring::new(docstring));
             }
@@ -298,51 +302,26 @@ impl GotoTarget<'_> {
             // (i.e. the type of `MyClass` in `MyClass()` is `<class MyClass>` and not `() -> MyClass`)
             GotoTarget::Call { callable, .. } => callable.inferred_type(model),
             GotoTarget::TypeParamTypeVarName(typevar) => typevar.inferred_type(model),
-            GotoTarget::ImportModuleComponent {
-                module_name,
-                component_index,
-                level,
-                ..
-            } => {
-                // We don't currently support hovering the bare `.` so there is always a name
-                let module = import_name(module_name, *component_index);
-                model.resolve_module_type(Some(module), *level)?
-            }
-            GotoTarget::StringAnnotationSubexpr {
-                string_expr,
-                subrange,
-                ..
-            } => {
-                let (subast, _submodel) = model.enter_string_annotation(string_expr)?;
-                let submod = subast.syntax();
-                let subnode = covering_node(submod.into(), *subrange).node();
-
-                // The type checker knows the type of the full annotation but nothing else
-                if AnyNodeRef::from(&*submod.body) == subnode {
-                    string_expr.inferred_type(model)
-                } else {
-                    // TODO: force the typechecker to tell us its secrets
-                    // (it computes but then immediately discards these types)
-                    return None;
-                }
-            }
-            GotoTarget::BinOp { expression, .. } => {
-                let (_, ty) = ty_python_semantic::definitions_for_bin_op(model, expression)?;
-                ty
-            }
-            GotoTarget::UnaryOp { expression, .. } => {
-                let (_, ty) = ty_python_semantic::definitions_for_unary_op(model, expression)?;
-                ty
-            }
             // TODO: Support identifier targets
             GotoTarget::PatternMatchRest(_)
             | GotoTarget::PatternKeywordArgument(_)
             | GotoTarget::PatternMatchStarName(_)
             | GotoTarget::PatternMatchAsName(_)
+            | GotoTarget::ImportModuleComponent { .. }
             | GotoTarget::TypeParamParamSpecName(_)
             | GotoTarget::TypeParamTypeVarTupleName(_)
             | GotoTarget::NonLocal { .. }
             | GotoTarget::Globals { .. } => return None,
+            GotoTarget::BinOp { expression, .. } => {
+                let (_, ty) =
+                    ty_python_semantic::definitions_for_bin_op(model.db(), model, expression)?;
+                ty
+            }
+            GotoTarget::UnaryOp { expression, .. } => {
+                let (_, ty) =
+                    ty_python_semantic::definitions_for_unary_op(model.db(), model, expression)?;
+                ty
+            }
         };
 
         Some(ty)
@@ -354,7 +333,7 @@ impl GotoTarget<'_> {
         model: &SemanticModel,
     ) -> Option<String> {
         if let GotoTarget::Call { call, .. } = self {
-            call_type_simplified_by_overloads(model, call)
+            call_type_simplified_by_overloads(model.db(), model, call)
         } else {
             None
         }
@@ -374,56 +353,84 @@ impl GotoTarget<'_> {
     /// as just returning a raw `NavigationTarget`.
     pub(crate) fn get_definition_targets<'db>(
         &self,
-        model: &SemanticModel<'db>,
+        file: ruff_db::files::File,
+        db: &'db dyn crate::Db,
         alias_resolution: ImportAliasResolution,
-    ) -> Option<Definitions<'db>> {
-        let definitions = match self {
-            GotoTarget::Expression(expression) => definitions_for_expression(model, *expression),
+    ) -> Option<DefinitionsOrTargets<'db>> {
+        use crate::NavigationTarget;
+
+        match self {
+            GotoTarget::Expression(expression) => definitions_for_expression(db, file, expression)
+                .map(DefinitionsOrTargets::Definitions),
+
             // For already-defined symbols, they are their own definitions
-            GotoTarget::FunctionDef(function) => Some(vec![ResolvedDefinition::Definition(
-                function.definition(model),
-            )]),
+            GotoTarget::FunctionDef(function) => {
+                let model = SemanticModel::new(db, file);
+                Some(DefinitionsOrTargets::Definitions(vec![
+                    ResolvedDefinition::Definition(function.definition(&model)),
+                ]))
+            }
 
-            GotoTarget::ClassDef(class) => Some(vec![ResolvedDefinition::Definition(
-                class.definition(model),
-            )]),
+            GotoTarget::ClassDef(class) => {
+                let model = SemanticModel::new(db, file);
+                Some(DefinitionsOrTargets::Definitions(vec![
+                    ResolvedDefinition::Definition(class.definition(&model)),
+                ]))
+            }
 
-            GotoTarget::Parameter(parameter) => Some(vec![ResolvedDefinition::Definition(
-                parameter.definition(model),
-            )]),
+            GotoTarget::Parameter(parameter) => {
+                let model = SemanticModel::new(db, file);
+                Some(DefinitionsOrTargets::Definitions(vec![
+                    ResolvedDefinition::Definition(parameter.definition(&model)),
+                ]))
+            }
 
             // For import aliases (offset within 'y' or 'z' in "from x import y as z")
             GotoTarget::ImportSymbolAlias {
                 alias, import_from, ..
             } => {
                 let symbol_name = alias.name.as_str();
-                Some(definitions_for_imported_symbol(
-                    model,
-                    import_from,
-                    symbol_name,
-                    alias_resolution,
+                Some(DefinitionsOrTargets::Definitions(
+                    definitions_for_imported_symbol(
+                        db,
+                        file,
+                        import_from,
+                        symbol_name,
+                        alias_resolution,
+                    ),
                 ))
             }
 
             GotoTarget::ImportModuleComponent {
                 module_name,
                 component_index,
-                level,
                 ..
             } => {
-                // We don't currently support hovering the bare `.` so there is always a name
-                let module = import_name(module_name, *component_index);
-                definitions_for_module(model, Some(module), *level)
+                // Handle both `import foo.bar` and `from foo.bar import baz` where offset is within module component
+                let components: Vec<&str> = module_name.split('.').collect();
+
+                // Build the module name up to and including the component containing the offset
+                let target_module_name = components[..=*component_index].join(".");
+
+                // Try to resolve the module
+                definitions_for_module(db, &target_module_name)
             }
 
             // Handle import aliases (offset within 'z' in "import x.y as z")
             GotoTarget::ImportModuleAlias { alias } => {
                 if alias_resolution == ImportAliasResolution::ResolveAliases {
-                    definitions_for_module(model, Some(alias.name.as_str()), 0)
+                    let full_module_name = alias.name.as_str();
+                    // Try to resolve the module
+                    definitions_for_module(db, full_module_name)
                 } else {
-                    alias.asname.as_ref().map(|name| {
-                        definitions_for_name(model, name.as_str(), AnyNodeRef::Identifier(name))
-                    })
+                    let alias_range = alias.asname.as_ref().unwrap().range;
+                    Some(DefinitionsOrTargets::Targets(
+                        crate::NavigationTargets::single(NavigationTarget {
+                            file,
+                            focus_range: alias_range,
+                            full_range: alias.range(),
+                        }),
+                    ))
                 }
             }
 
@@ -431,128 +438,77 @@ impl GotoTarget<'_> {
             GotoTarget::KeywordArgument {
                 keyword,
                 call_expression,
-            } => Some(definitions_for_keyword_argument(
-                model,
-                keyword,
-                call_expression,
+            } => Some(DefinitionsOrTargets::Definitions(
+                definitions_for_keyword_argument(db, file, keyword, call_expression),
             )),
 
             // For exception variables, they are their own definitions (like parameters)
             GotoTarget::ExceptVariable(except_handler) => {
-                Some(vec![ResolvedDefinition::Definition(
-                    except_handler.definition(model),
-                )])
+                let model = SemanticModel::new(db, file);
+                Some(DefinitionsOrTargets::Definitions(vec![
+                    ResolvedDefinition::Definition(except_handler.definition(&model)),
+                ]))
             }
 
-            // Patterns are glorified assignments but we have to look them up by ident
-            // because they're not expressions
+            // For pattern match rest variables, they are their own definitions
             GotoTarget::PatternMatchRest(pattern_mapping) => {
-                pattern_mapping.rest.as_ref().map(|name| {
-                    definitions_for_name(model, name.as_str(), AnyNodeRef::Identifier(name))
-                })
+                if let Some(rest_name) = &pattern_mapping.rest {
+                    let range = rest_name.range;
+                    Some(DefinitionsOrTargets::Targets(
+                        crate::NavigationTargets::single(NavigationTarget::new(file, range)),
+                    ))
+                } else {
+                    None
+                }
             }
 
-            GotoTarget::PatternMatchAsName(pattern_as) => pattern_as.name.as_ref().map(|name| {
-                definitions_for_name(model, name.as_str(), AnyNodeRef::Identifier(name))
-            }),
-
-            GotoTarget::PatternKeywordArgument(pattern_keyword) => {
-                let name = &pattern_keyword.attr;
-                Some(definitions_for_name(
-                    model,
-                    name.as_str(),
-                    AnyNodeRef::Identifier(name),
-                ))
-            }
-
-            GotoTarget::PatternMatchStarName(pattern_star) => {
-                pattern_star.name.as_ref().map(|name| {
-                    definitions_for_name(model, name.as_str(), AnyNodeRef::Identifier(name))
-                })
+            // For pattern match as names, they are their own definitions
+            GotoTarget::PatternMatchAsName(pattern_as) => {
+                if let Some(name) = &pattern_as.name {
+                    let range = name.range;
+                    Some(DefinitionsOrTargets::Targets(
+                        crate::NavigationTargets::single(NavigationTarget::new(file, range)),
+                    ))
+                } else {
+                    None
+                }
             }
 
             // For callables, both the definition of the callable and the actual function impl are relevant.
             //
             // Prefer the function impl over the callable so that its docstrings win if defined.
             GotoTarget::Call { callable, call } => {
-                let mut definitions = definitions_for_callable(model, call);
+                let mut definitions = definitions_for_callable(db, file, call);
                 let expr_definitions =
-                    definitions_for_expression(model, *callable).unwrap_or_default();
+                    definitions_for_expression(db, file, callable).unwrap_or_default();
                 definitions.extend(expr_definitions);
 
                 if definitions.is_empty() {
                     None
                 } else {
-                    Some(definitions)
+                    Some(DefinitionsOrTargets::Definitions(definitions))
                 }
             }
 
             GotoTarget::BinOp { expression, .. } => {
-                let (definitions, _) =
-                    ty_python_semantic::definitions_for_bin_op(model, expression)?;
+                let model = SemanticModel::new(db, file);
 
-                Some(definitions)
+                let (definitions, _) =
+                    ty_python_semantic::definitions_for_bin_op(db, &model, expression)?;
+
+                Some(DefinitionsOrTargets::Definitions(definitions))
             }
 
             GotoTarget::UnaryOp { expression, .. } => {
+                let model = SemanticModel::new(db, file);
                 let (definitions, _) =
-                    ty_python_semantic::definitions_for_unary_op(model, expression)?;
+                    ty_python_semantic::definitions_for_unary_op(db, &model, expression)?;
 
-                Some(definitions)
+                Some(DefinitionsOrTargets::Definitions(definitions))
             }
 
-            // String annotations sub-expressions require us to recurse into the sub-AST
-            GotoTarget::StringAnnotationSubexpr {
-                string_expr,
-                subrange,
-                ..
-            } => {
-                let (subast, submodel) = model.enter_string_annotation(string_expr)?;
-                let subexpr = covering_node(subast.syntax().into(), *subrange)
-                    .node()
-                    .as_expr_ref()?;
-                definitions_for_expression(&submodel, subexpr)
-            }
-
-            // nonlocal and global are essentially loads, but again they're statements,
-            // so we need to look them up by ident
-            GotoTarget::NonLocal { identifier } | GotoTarget::Globals { identifier } => {
-                Some(definitions_for_name(
-                    model,
-                    identifier.as_str(),
-                    AnyNodeRef::Identifier(identifier),
-                ))
-            }
-
-            // These are declarations of sorts, but they're stmts and not exprs, so look up by ident.
-            GotoTarget::TypeParamTypeVarName(type_var) => {
-                let name = &type_var.name;
-                Some(definitions_for_name(
-                    model,
-                    name.as_str(),
-                    AnyNodeRef::Identifier(name),
-                ))
-            }
-
-            GotoTarget::TypeParamParamSpecName(name) => {
-                let name = &name.name;
-                Some(definitions_for_name(
-                    model,
-                    name.as_str(),
-                    AnyNodeRef::Identifier(name),
-                ))
-            }
-
-            GotoTarget::TypeParamTypeVarTupleName(name) => {
-                let name = &name.name;
-                Some(definitions_for_name(
-                    model,
-                    name.as_str(),
-                    AnyNodeRef::Identifier(name),
-                ))
-            }
-        };
-        definitions.map(Definitions)
+            _ => None,
+        }
     }
 
     /// Returns the text representation of this goto target.
@@ -570,7 +526,6 @@ impl GotoTarget<'_> {
                 ast::ExprRef::Attribute(attr) => Some(Cow::Borrowed(attr.attr.as_str())),
                 _ => None,
             },
-            GotoTarget::StringAnnotationSubexpr { name, .. } => name.as_deref().map(Cow::Borrowed),
             GotoTarget::FunctionDef(function) => Some(Cow::Borrowed(function.name.as_str())),
             GotoTarget::ClassDef(class) => Some(Cow::Borrowed(class.name.as_str())),
             GotoTarget::Parameter(parameter) => Some(Cow::Borrowed(parameter.name.as_str())),
@@ -631,7 +586,6 @@ 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: &crate::find_node::CoveringNode<'a>,
         offset: TextSize,
         tokens: &Tokens,
@@ -678,7 +632,6 @@ impl GotoTarget<'_> {
                                 {
                                     return Some(GotoTarget::ImportModuleComponent {
                                         module_name: full_name.to_string(),
-                                        level: 0,
                                         component_index,
                                         component_range,
                                     });
@@ -719,12 +672,14 @@ impl GotoTarget<'_> {
                     // Handle offset within module name in from import statements
                     if let Some(module_expr) = &from.module {
                         let full_module_name = module_expr.to_string();
-                        if let Some((component_index, component_range)) =
-                            find_module_component(&full_module_name, module_expr.start(), offset)
-                        {
+
+                        if let Some((component_index, component_range)) = find_module_component(
+                            &full_module_name,
+                            module_expr.range.start(),
+                            offset,
+                        ) {
                             return Some(GotoTarget::ImportModuleComponent {
                                 module_name: full_module_name,
-                                level: from.level,
                                 component_index,
                                 component_range,
                             });
@@ -831,31 +786,6 @@ impl GotoTarget<'_> {
                 Some(GotoTarget::Expression(unary.into()))
             }
 
-            node @ AnyNodeRef::ExprStringLiteral(string_expr) => {
-                // Check if we've clicked on a sub-GotoTarget inside a string annotation's sub-AST
-                if let Some((subast, submodel)) = model.enter_string_annotation(string_expr)
-                    && let Some(GotoTarget::Expression(subexpr)) = find_goto_target_impl(
-                        &submodel,
-                        subast.tokens(),
-                        subast.syntax().into(),
-                        offset,
-                    )
-                {
-                    let name = match subexpr {
-                        ast::ExprRef::Name(name) => Some(name.id.to_string()),
-                        ast::ExprRef::Attribute(attr) => Some(attr.attr.to_string()),
-                        _ => None,
-                    };
-                    Some(GotoTarget::StringAnnotationSubexpr {
-                        string_expr,
-                        subrange: subexpr.range(),
-                        name,
-                    })
-                } else {
-                    node.as_expr_ref().map(GotoTarget::Expression)
-                }
-            }
-
             node => {
                 // Check if this is seemingly a callable being invoked (the `x` in `x(...)`)
                 let parent = covering_node.parent();
@@ -891,7 +821,6 @@ impl Ranged for GotoTarget<'_> {
             GotoTarget::ImportModuleComponent {
                 component_range, ..
             } => *component_range,
-            GotoTarget::StringAnnotationSubexpr { subrange, .. } => *subrange,
             GotoTarget::ImportModuleAlias { alias } => alias.asname.as_ref().unwrap().range,
             GotoTarget::ExceptVariable(except) => except.name.as_ref().unwrap().range,
             GotoTarget::KeywordArgument { keyword, .. } => keyword.arg.as_ref().unwrap().range,
@@ -911,9 +840,9 @@ impl Ranged for GotoTarget<'_> {
 }
 
 /// Converts a collection of `ResolvedDefinition` items into `NavigationTarget` items.
-fn convert_resolved_definitions_to_targets<'db>(
-    db: &'db dyn ty_python_semantic::Db,
-    definitions: Vec<ty_python_semantic::ResolvedDefinition<'db>>,
+fn convert_resolved_definitions_to_targets(
+    db: &dyn crate::Db,
+    definitions: Vec<ty_python_semantic::ResolvedDefinition<'_>>,
 ) -> Vec<crate::NavigationTarget> {
     definitions
         .into_iter()
@@ -947,28 +876,27 @@ fn convert_resolved_definitions_to_targets<'db>(
 
 /// Shared helper to get definitions for an expr (that is presumably a name/attr)
 fn definitions_for_expression<'db>(
-    model: &SemanticModel<'db>,
-    expression: ruff_python_ast::ExprRef<'_>,
+    db: &'db dyn crate::Db,
+    file: ruff_db::files::File,
+    expression: &ruff_python_ast::ExprRef<'_>,
 ) -> Option<Vec<ResolvedDefinition<'db>>> {
     match expression {
-        ast::ExprRef::Name(name) => Some(definitions_for_name(
-            model,
-            name.id.as_str(),
-            expression.into(),
-        )),
+        ast::ExprRef::Name(name) => Some(definitions_for_name(db, file, name)),
         ast::ExprRef::Attribute(attribute) => Some(ty_python_semantic::definitions_for_attribute(
-            model, attribute,
+            db, file, attribute,
         )),
         _ => None,
     }
 }
 
 fn definitions_for_callable<'db>(
-    model: &SemanticModel<'db>,
+    db: &'db dyn crate::Db,
+    file: ruff_db::files::File,
     call: &ast::ExprCall,
 ) -> Vec<ResolvedDefinition<'db>> {
+    let model = SemanticModel::new(db, file);
     // Attempt to refine to a specific call
-    let signature_info = call_signature_details(model, call);
+    let signature_info = call_signature_details(db, &model, call);
     signature_info
         .into_iter()
         .filter_map(|signature| signature.definition.map(ResolvedDefinition::Definition))
@@ -977,7 +905,7 @@ fn definitions_for_callable<'db>(
 
 /// Shared helper to map and convert resolved definitions into navigation targets.
 fn definitions_to_navigation_targets<'db>(
-    db: &dyn ty_python_semantic::Db,
+    db: &dyn crate::Db,
     stub_mapper: Option<&StubMapper<'db>>,
     mut definitions: Vec<ty_python_semantic::ResolvedDefinition<'db>>,
 ) -> Option<crate::NavigationTargets> {
@@ -992,21 +920,12 @@ fn definitions_to_navigation_targets<'db>(
     }
 }
 
-pub(crate) fn find_goto_target<'a>(
-    model: &'a SemanticModel,
-    parsed: &'a ParsedModuleRef,
+pub(crate) fn find_goto_target(
+    parsed: &ParsedModuleRef,
     offset: TextSize,
-) -> Option<GotoTarget<'a>> {
-    find_goto_target_impl(model, parsed.tokens(), parsed.syntax().into(), offset)
-}
-
-pub(crate) fn find_goto_target_impl<'a>(
-    model: &'a SemanticModel,
-    tokens: &'a Tokens,
-    syntax: AnyNodeRef<'a>,
-    offset: TextSize,
-) -> Option<GotoTarget<'a>> {
-    let token = tokens
+) -> Option<GotoTarget<'_>> {
+    let token = parsed
+        .tokens()
         .at_offset(offset)
         .max_by_key(|token| match token.kind() {
             TokenKind::Name
@@ -1027,24 +946,30 @@ pub(crate) fn find_goto_target_impl<'a>(
         return None;
     }
 
-    let covering_node = covering_node(syntax, token.range())
-        .find_first(|node| {
-            node.is_identifier() || node.is_expression() || node.is_stmt_import_from()
-        })
+    let covering_node = covering_node(parsed.syntax().into(), token.range())
+        .find_first(|node| node.is_identifier() || node.is_expression())
         .ok()?;
 
-    GotoTarget::from_covering_node(model, &covering_node, offset, tokens)
+    GotoTarget::from_covering_node(&covering_node, offset, parsed.tokens())
 }
 
 /// Helper function to resolve a module name and create a navigation target.
 fn definitions_for_module<'db>(
-    model: &SemanticModel<'db>,
-    module: Option<&str>,
-    level: u32,
-) -> Option<Vec<ResolvedDefinition<'db>>> {
-    let module = model.resolve_module(module, level)?;
-    let file = module.file(model.db())?;
-    Some(vec![ResolvedDefinition::Module(file)])
+    db: &'db dyn crate::Db,
+    module_name_str: &str,
+) -> Option<DefinitionsOrTargets<'db>> {
+    use ty_python_semantic::{ModuleName, resolve_module};
+
+    if let Some(module_name) = ModuleName::new(module_name_str) {
+        if let Some(resolved_module) = resolve_module(db, &module_name) {
+            if let Some(module_file) = resolved_module.file(db) {
+                return Some(DefinitionsOrTargets::Definitions(vec![
+                    ResolvedDefinition::Module(module_file),
+                ]));
+            }
+        }
+    }
+    None
 }
 
 /// Helper function to extract module component information from a dotted module name
@@ -1058,7 +983,9 @@ fn find_module_component(
 
     // Split the module name into components and find which one contains the offset
     let mut current_pos = 0;
-    for (i, component) in full_module_name.split('.').enumerate() {
+    let components: Vec<&str> = full_module_name.split('.').collect();
+
+    for (i, component) in components.iter().enumerate() {
         let component_start = current_pos;
         let component_end = current_pos + component.len();
 
@@ -1077,16 +1004,3 @@ fn find_module_component(
 
     None
 }
-
-/// Helper to get the module name up to the given component index
-fn import_name(module_name: &str, component_index: usize) -> &str {
-    // We want everything to the left of the nth `.`
-    // If there's no nth `.` then we want the whole thing.
-    let idx = module_name
-        .match_indices('.')
-        .nth(component_index)
-        .map(|(idx, _)| idx)
-        .unwrap_or(module_name.len());
-
-    &module_name[..idx]
-}

crates/ty_ide/src/goto_declaration.rs

@@ -3,7 +3,7 @@ use crate::{Db, NavigationTargets, RangedValue};
 use ruff_db::files::{File, FileRange};
 use ruff_db::parsed::parsed_module;
 use ruff_text_size::{Ranged, TextSize};
-use ty_python_semantic::{ImportAliasResolution, SemanticModel};
+use ty_python_semantic::ImportAliasResolution;
 
 /// Navigate to the declaration of a symbol.
 ///
@@ -16,11 +16,10 @@ pub fn goto_declaration(
     offset: TextSize,
 ) -> Option<RangedValue<NavigationTargets>> {
     let module = parsed_module(db, file).load(db);
-    let model = SemanticModel::new(db, file);
-    let goto_target = find_goto_target(&model, &module, offset)?;
+    let goto_target = find_goto_target(&module, offset)?;
 
     let declaration_targets = goto_target
-        .get_definition_targets(&model, ImportAliasResolution::ResolveAliases)?
+        .get_definition_targets(file, db, ImportAliasResolution::ResolveAliases)?
         .declaration_targets(db)?;
 
     Some(RangedValue {
@@ -889,190 +888,6 @@ def another_helper(path):
         ");
     }
 
-    #[test]
-    fn goto_declaration_string_annotation1() {
-        let test = cursor_test(
-            r#"
-        a: "MyCla<CURSOR>ss" = 1
-
-        class MyClass:
-            """some docs"""
-        "#,
-        );
-
-        assert_snapshot!(test.goto_declaration(), @r#"
-        info[goto-declaration]: Declaration
-         --> main.py:4:7
-          |
-        2 | a: "MyClass" = 1
-        3 |
-        4 | class MyClass:
-          |       ^^^^^^^
-        5 |     """some docs"""
-          |
-        info: Source
-         --> main.py:2:5
-          |
-        2 | a: "MyClass" = 1
-          |     ^^^^^^^
-        3 |
-        4 | class MyClass:
-          |
-        "#);
-    }
-
-    #[test]
-    fn goto_declaration_string_annotation2() {
-        let test = cursor_test(
-            r#"
-        a: "None | MyCl<CURSOR>ass" = 1
-
-        class MyClass:
-            """some docs"""
-        "#,
-        );
-
-        assert_snapshot!(test.goto_declaration(), @r#"
-        info[goto-declaration]: Declaration
-         --> main.py:4:7
-          |
-        2 | a: "None | MyClass" = 1
-        3 |
-        4 | class MyClass:
-          |       ^^^^^^^
-        5 |     """some docs"""
-          |
-        info: Source
-         --> main.py:2:12
-          |
-        2 | a: "None | MyClass" = 1
-          |            ^^^^^^^
-        3 |
-        4 | class MyClass:
-          |
-        "#);
-    }
-
-    #[test]
-    fn goto_declaration_string_annotation3() {
-        let test = cursor_test(
-            r#"
-        a: "None |<CURSOR> MyClass" = 1
-
-        class MyClass:
-            """some docs"""
-        "#,
-        );
-
-        assert_snapshot!(test.goto_declaration(), @"No goto target found");
-    }
-
-    #[test]
-    fn goto_declaration_string_annotation4() {
-        let test = cursor_test(
-            r#"
-        a: "None | MyClass<CURSOR>" = 1
-
-        class MyClass:
-            """some docs"""
-        "#,
-        );
-
-        assert_snapshot!(test.goto_declaration(), @r#"
-        info[goto-declaration]: Declaration
-         --> main.py:4:7
-          |
-        2 | a: "None | MyClass" = 1
-        3 |
-        4 | class MyClass:
-          |       ^^^^^^^
-        5 |     """some docs"""
-          |
-        info: Source
-         --> main.py:2:12
-          |
-        2 | a: "None | MyClass" = 1
-          |            ^^^^^^^
-        3 |
-        4 | class MyClass:
-          |
-        "#);
-    }
-
-    #[test]
-    fn goto_declaration_string_annotation5() {
-        let test = cursor_test(
-            r#"
-        a: "None | MyClass"<CURSOR> = 1
-
-        class MyClass:
-            """some docs"""
-        "#,
-        );
-
-        assert_snapshot!(test.goto_declaration(), @"No goto target found");
-    }
-
-    #[test]
-    fn goto_declaration_string_annotation_dangling1() {
-        let test = cursor_test(
-            r#"
-        a: "MyCl<CURSOR>ass |" = 1
-
-        class MyClass:
-            """some docs"""
-        "#,
-        );
-
-        assert_snapshot!(test.goto_declaration(), @"No goto target found");
-    }
-
-    #[test]
-    fn goto_declaration_string_annotation_dangling2() {
-        let test = cursor_test(
-            r#"
-        a: "MyCl<CURSOR>ass | No" = 1
-
-        class MyClass:
-            """some docs"""
-        "#,
-        );
-
-        assert_snapshot!(test.goto_declaration(), @r#"
-        info[goto-declaration]: Declaration
-         --> main.py:4:7
-          |
-        2 | a: "MyClass | No" = 1
-        3 |
-        4 | class MyClass:
-          |       ^^^^^^^
-        5 |     """some docs"""
-          |
-        info: Source
-         --> main.py:2:5
-          |
-        2 | a: "MyClass | No" = 1
-          |     ^^^^^^^
-        3 |
-        4 | class MyClass:
-          |
-        "#);
-    }
-
-    #[test]
-    fn goto_declaration_string_annotation_dangling3() {
-        let test = cursor_test(
-            r#"
-        a: "MyClass | N<CURSOR>o" = 1
-
-        class MyClass:
-            """some docs"""
-        "#,
-        );
-
-        assert_snapshot!(test.goto_declaration(), @"No goto target found");
-    }
-
     #[test]
     fn goto_declaration_nested_instance_attribute() {
         let test = cursor_test(
@@ -1254,45 +1069,6 @@ def outer():
         "#);
     }
 
-    #[test]
-    fn goto_declaration_nonlocal_stmt() {
-        let test = cursor_test(
-            r#"
-def outer():
-    xy = "outer_value"
-    
-    def inner():
-        nonlocal x<CURSOR>y
-        xy = "modified"
-        return x  # Should find the nonlocal x declaration in outer scope
-    
-    return inner
-"#,
-        );
-
-        // Should find the variable declaration in the outer scope, not the nonlocal statement
-        assert_snapshot!(test.goto_declaration(), @r#"
-        info[goto-declaration]: Declaration
-         --> main.py:3:5
-          |
-        2 | def outer():
-        3 |     xy = "outer_value"
-          |     ^^
-        4 |
-        5 |     def inner():
-          |
-        info: Source
-         --> main.py:6:18
-          |
-        5 |     def inner():
-        6 |         nonlocal xy
-          |                  ^^
-        7 |         xy = "modified"
-        8 |         return x  # Should find the nonlocal x declaration in outer scope
-          |
-        "#);
-    }
-
     #[test]
     fn goto_declaration_global_binding() {
         let test = cursor_test(
@@ -1327,41 +1103,6 @@ def function():
         "#);
     }
 
-    #[test]
-    fn goto_declaration_global_stmt() {
-        let test = cursor_test(
-            r#"
-global_var = "global_value"
-
-def function():
-    global global_<CURSOR>var
-    global_var = "modified"
-    return global_var  # Should find the global variable declaration
-"#,
-        );
-
-        // Should find the global variable declaration, not the global statement
-        assert_snapshot!(test.goto_declaration(), @r#"
-        info[goto-declaration]: Declaration
-         --> main.py:2:1
-          |
-        2 | global_var = "global_value"
-          | ^^^^^^^^^^
-        3 |
-        4 | def function():
-          |
-        info: Source
-         --> main.py:5:12
-          |
-        4 | def function():
-        5 |     global global_var
-          |            ^^^^^^^^^^
-        6 |     global_var = "modified"
-        7 |     return global_var  # Should find the global variable declaration
-          |
-        "#);
-    }
-
     #[test]
     fn goto_declaration_inherited_attribute() {
         let test = cursor_test(
@@ -1397,486 +1138,6 @@ def function():
         ");
     }
 
-    #[test]
-    fn goto_declaration_match_name_stmt() {
-        let test = cursor_test(
-            r#"
-            def my_func(command: str):
-                match command.split():
-                    case ["get", a<CURSOR>b]:
-                        x = ab
-            "#,
-        );
-
-        assert_snapshot!(test.goto_declaration(), @r#"
-        info[goto-declaration]: Declaration
-         --> main.py:4:22
-          |
-        2 | def my_func(command: str):
-        3 |     match command.split():
-        4 |         case ["get", ab]:
-          |                      ^^
-        5 |             x = ab
-          |
-        info: Source
-         --> main.py:4:22
-          |
-        2 | def my_func(command: str):
-        3 |     match command.split():
-        4 |         case ["get", ab]:
-          |                      ^^
-        5 |             x = ab
-          |
-        "#);
-    }
-
-    #[test]
-    fn goto_declaration_match_name_binding() {
-        let test = cursor_test(
-            r#"
-            def my_func(command: str):
-                match command.split():
-                    case ["get", ab]:
-                        x = a<CURSOR>b
-            "#,
-        );
-
-        assert_snapshot!(test.goto_declaration(), @r#"
-        info[goto-declaration]: Declaration
-         --> main.py:4:22
-          |
-        2 | def my_func(command: str):
-        3 |     match command.split():
-        4 |         case ["get", ab]:
-          |                      ^^
-        5 |             x = ab
-          |
-        info: Source
-         --> main.py:5:17
-          |
-        3 |     match command.split():
-        4 |         case ["get", ab]:
-        5 |             x = ab
-          |                 ^^
-          |
-        "#);
-    }
-
-    #[test]
-    fn goto_declaration_match_rest_stmt() {
-        let test = cursor_test(
-            r#"
-            def my_func(command: str):
-                match command.split():
-                    case ["get", *a<CURSOR>b]:
-                        x = ab
-            "#,
-        );
-
-        assert_snapshot!(test.goto_declaration(), @r#"
-        info[goto-declaration]: Declaration
-         --> main.py:4:23
-          |
-        2 | def my_func(command: str):
-        3 |     match command.split():
-        4 |         case ["get", *ab]:
-          |                       ^^
-        5 |             x = ab
-          |
-        info: Source
-         --> main.py:4:23
-          |
-        2 | def my_func(command: str):
-        3 |     match command.split():
-        4 |         case ["get", *ab]:
-          |                       ^^
-        5 |             x = ab
-          |
-        "#);
-    }
-
-    #[test]
-    fn goto_declaration_match_rest_binding() {
-        let test = cursor_test(
-            r#"
-            def my_func(command: str):
-                match command.split():
-                    case ["get", *ab]:
-                        x = a<CURSOR>b
-            "#,
-        );
-
-        assert_snapshot!(test.goto_declaration(), @r#"
-        info[goto-declaration]: Declaration
-         --> main.py:4:23
-          |
-        2 | def my_func(command: str):
-        3 |     match command.split():
-        4 |         case ["get", *ab]:
-          |                       ^^
-        5 |             x = ab
-          |
-        info: Source
-         --> main.py:5:17
-          |
-        3 |     match command.split():
-        4 |         case ["get", *ab]:
-        5 |             x = ab
-          |                 ^^
-          |
-        "#);
-    }
-
-    #[test]
-    fn goto_declaration_match_as_stmt() {
-        let test = cursor_test(
-            r#"
-            def my_func(command: str):
-                match command.split():
-                    case ["get", ("a" | "b") as a<CURSOR>b]:
-                        x = ab
-            "#,
-        );
-
-        assert_snapshot!(test.goto_declaration(), @r#"
-        info[goto-declaration]: Declaration
-         --> main.py:4:37
-          |
-        2 | def my_func(command: str):
-        3 |     match command.split():
-        4 |         case ["get", ("a" | "b") as ab]:
-          |                                     ^^
-        5 |             x = ab
-          |
-        info: Source
-         --> main.py:4:37
-          |
-        2 | def my_func(command: str):
-        3 |     match command.split():
-        4 |         case ["get", ("a" | "b") as ab]:
-          |                                     ^^
-        5 |             x = ab
-          |
-        "#);
-    }
-
-    #[test]
-    fn goto_declaration_match_as_binding() {
-        let test = cursor_test(
-            r#"
-            def my_func(command: str):
-                match command.split():
-                    case ["get", ("a" | "b") as ab]:
-                        x = a<CURSOR>b
-            "#,
-        );
-
-        assert_snapshot!(test.goto_declaration(), @r#"
-        info[goto-declaration]: Declaration
-         --> main.py:4:37
-          |
-        2 | def my_func(command: str):
-        3 |     match command.split():
-        4 |         case ["get", ("a" | "b") as ab]:
-          |                                     ^^
-        5 |             x = ab
-          |
-        info: Source
-         --> main.py:5:17
-          |
-        3 |     match command.split():
-        4 |         case ["get", ("a" | "b") as ab]:
-        5 |             x = ab
-          |                 ^^
-          |
-        "#);
-    }
-
-    #[test]
-    fn goto_declaration_match_keyword_stmt() {
-        let test = cursor_test(
-            r#"
-            class Click:
-                __match_args__ = ("position", "button")
-                def __init__(self, pos, btn):
-                    self.position: int = pos
-                    self.button: str = btn
-            
-            def my_func(event: Click):
-                match event:
-                    case Click(x, button=a<CURSOR>b):
-                        x = ab
-            "#,
-        );
-
-        assert_snapshot!(test.goto_declaration(), @r"
-        info[goto-declaration]: Declaration
-          --> main.py:10:30
-           |
-         8 | def my_func(event: Click):
-         9 |     match event:
-        10 |         case Click(x, button=ab):
-           |                              ^^
-        11 |             x = ab
-           |
-        info: Source
-          --> main.py:10:30
-           |
-         8 | def my_func(event: Click):
-         9 |     match event:
-        10 |         case Click(x, button=ab):
-           |                              ^^
-        11 |             x = ab
-           |
-        ");
-    }
-
-    #[test]
-    fn goto_declaration_match_keyword_binding() {
-        let test = cursor_test(
-            r#"
-            class Click:
-                __match_args__ = ("position", "button")
-                def __init__(self, pos, btn):
-                    self.position: int = pos
-                    self.button: str = btn
-            
-            def my_func(event: Click):
-                match event:
-                    case Click(x, button=ab):
-                        x = a<CURSOR>b
-            "#,
-        );
-
-        assert_snapshot!(test.goto_declaration(), @r"
-        info[goto-declaration]: Declaration
-          --> main.py:10:30
-           |
-         8 | def my_func(event: Click):
-         9 |     match event:
-        10 |         case Click(x, button=ab):
-           |                              ^^
-        11 |             x = ab
-           |
-        info: Source
-          --> main.py:11:17
-           |
-         9 |     match event:
-        10 |         case Click(x, button=ab):
-        11 |             x = ab
-           |                 ^^
-           |
-        ");
-    }
-
-    #[test]
-    fn goto_declaration_match_class_name() {
-        let test = cursor_test(
-            r#"
-            class Click:
-                __match_args__ = ("position", "button")
-                def __init__(self, pos, btn):
-                    self.position: int = pos
-                    self.button: str = btn
-            
-            def my_func(event: Click):
-                match event:
-                    case Cl<CURSOR>ick(x, button=ab):
-                        x = ab
-            "#,
-        );
-
-        assert_snapshot!(test.goto_declaration(), @r#"
-        info[goto-declaration]: Declaration
-         --> main.py:2:7
-          |
-        2 | class Click:
-          |       ^^^^^
-        3 |     __match_args__ = ("position", "button")
-        4 |     def __init__(self, pos, btn):
-          |
-        info: Source
-          --> main.py:10:14
-           |
-         8 | def my_func(event: Click):
-         9 |     match event:
-        10 |         case Click(x, button=ab):
-           |              ^^^^^
-        11 |             x = ab
-           |
-        "#);
-    }
-
-    #[test]
-    fn goto_declaration_match_class_field_name() {
-        let test = cursor_test(
-            r#"
-            class Click:
-                __match_args__ = ("position", "button")
-                def __init__(self, pos, btn):
-                    self.position: int = pos
-                    self.button: str = btn
-            
-            def my_func(event: Click):
-                match event:
-                    case Click(x, but<CURSOR>ton=ab):
-                        x = ab
-            "#,
-        );
-
-        assert_snapshot!(test.goto_declaration(), @"No goto target found");
-    }
-
-    #[test]
-    fn goto_declaration_typevar_name_stmt() {
-        let test = cursor_test(
-            r#"
-            type Alias1[A<CURSOR>B: int = bool] = tuple[AB, list[AB]]
-            "#,
-        );
-
-        assert_snapshot!(test.goto_declaration(), @r"
-        info[goto-declaration]: Declaration
-         --> main.py:2:13
-          |
-        2 | type Alias1[AB: int = bool] = tuple[AB, list[AB]]
-          |             ^^
-          |
-        info: Source
-         --> main.py:2:13
-          |
-        2 | type Alias1[AB: int = bool] = tuple[AB, list[AB]]
-          |             ^^
-          |
-        ");
-    }
-
-    #[test]
-    fn goto_declaration_typevar_name_binding() {
-        let test = cursor_test(
-            r#"
-            type Alias1[AB: int = bool] = tuple[A<CURSOR>B, list[AB]]
-            "#,
-        );
-
-        assert_snapshot!(test.goto_declaration(), @r"
-        info[goto-declaration]: Declaration
-         --> main.py:2:13
-          |
-        2 | type Alias1[AB: int = bool] = tuple[AB, list[AB]]
-          |             ^^
-          |
-        info: Source
-         --> main.py:2:37
-          |
-        2 | type Alias1[AB: int = bool] = tuple[AB, list[AB]]
-          |                                     ^^
-          |
-        ");
-    }
-
-    #[test]
-    fn goto_declaration_typevar_spec_stmt() {
-        let test = cursor_test(
-            r#"
-            from typing import Callable
-            type Alias2[**A<CURSOR>B = [int, str]] = Callable[AB, tuple[AB]]
-            "#,
-        );
-
-        assert_snapshot!(test.goto_declaration(), @r"
-        info[goto-declaration]: Declaration
-         --> main.py:3:15
-          |
-        2 | from typing import Callable
-        3 | type Alias2[**AB = [int, str]] = Callable[AB, tuple[AB]]
-          |               ^^
-          |
-        info: Source
-         --> main.py:3:15
-          |
-        2 | from typing import Callable
-        3 | type Alias2[**AB = [int, str]] = Callable[AB, tuple[AB]]
-          |               ^^
-          |
-        ");
-    }
-
-    #[test]
-    fn goto_declaration_typevar_spec_binding() {
-        let test = cursor_test(
-            r#"
-            from typing import Callable
-            type Alias2[**AB = [int, str]] = Callable[A<CURSOR>B, tuple[AB]]
-            "#,
-        );
-
-        assert_snapshot!(test.goto_declaration(), @r"
-        info[goto-declaration]: Declaration
-         --> main.py:3:15
-          |
-        2 | from typing import Callable
-        3 | type Alias2[**AB = [int, str]] = Callable[AB, tuple[AB]]
-          |               ^^
-          |
-        info: Source
-         --> main.py:3:43
-          |
-        2 | from typing import Callable
-        3 | type Alias2[**AB = [int, str]] = Callable[AB, tuple[AB]]
-          |                                           ^^
-          |
-        ");
-    }
-
-    #[test]
-    fn goto_declaration_typevar_tuple_stmt() {
-        let test = cursor_test(
-            r#"
-            type Alias3[*A<CURSOR>B = ()] = tuple[tuple[*AB], tuple[*AB]]
-            "#,
-        );
-
-        assert_snapshot!(test.goto_declaration(), @r"
-        info[goto-declaration]: Declaration
-         --> main.py:2:14
-          |
-        2 | type Alias3[*AB = ()] = tuple[tuple[*AB], tuple[*AB]]
-          |              ^^
-          |
-        info: Source
-         --> main.py:2:14
-          |
-        2 | type Alias3[*AB = ()] = tuple[tuple[*AB], tuple[*AB]]
-          |              ^^
-          |
-        ");
-    }
-
-    #[test]
-    fn goto_declaration_typevar_tuple_binding() {
-        let test = cursor_test(
-            r#"
-            type Alias3[*AB = ()] = tuple[tuple[*A<CURSOR>B], tuple[*AB]]
-            "#,
-        );
-
-        assert_snapshot!(test.goto_declaration(), @r"
-        info[goto-declaration]: Declaration
-         --> main.py:2:14
-          |
-        2 | type Alias3[*AB = ()] = tuple[tuple[*AB], tuple[*AB]]
-          |              ^^
-          |
-        info: Source
-         --> main.py:2:38
-          |
-        2 | type Alias3[*AB = ()] = tuple[tuple[*AB], tuple[*AB]]
-          |                                      ^^
-          |
-        ");
-    }
-
     #[test]
     fn goto_declaration_property_getter_setter() {
         let test = cursor_test(

crates/ty_ide/src/goto_definition.rs

@@ -3,7 +3,7 @@ use crate::{Db, NavigationTargets, RangedValue};
 use ruff_db::files::{File, FileRange};
 use ruff_db::parsed::parsed_module;
 use ruff_text_size::{Ranged, TextSize};
-use ty_python_semantic::{ImportAliasResolution, SemanticModel};
+use ty_python_semantic::ImportAliasResolution;
 
 /// Navigate to the definition of a symbol.
 ///
@@ -17,10 +17,10 @@ pub fn goto_definition(
     offset: TextSize,
 ) -> Option<RangedValue<NavigationTargets>> {
     let module = parsed_module(db, file).load(db);
-    let model = SemanticModel::new(db, file);
-    let goto_target = find_goto_target(&model, &module, offset)?;
+    let goto_target = find_goto_target(&module, offset)?;
+
     let definition_targets = goto_target
-        .get_definition_targets(&model, ImportAliasResolution::ResolveAliases)?
+        .get_definition_targets(file, db, ImportAliasResolution::ResolveAliases)?
         .definition_targets(db)?;
 
     Some(RangedValue {

crates/ty_ide/src/goto_references.rs

@@ -3,11 +3,10 @@ use crate::references::{ReferencesMode, references};
 use crate::{Db, ReferenceTarget};
 use ruff_db::files::File;
 use ruff_text_size::TextSize;
-use ty_python_semantic::SemanticModel;
 
 /// Find all references to a symbol at the given position.
 /// Search for references across all files in the project.
-pub fn find_references(
+pub fn goto_references(
     db: &dyn Db,
     file: File,
     offset: TextSize,
@@ -15,10 +14,9 @@ pub fn find_references(
 ) -> Option<Vec<ReferenceTarget>> {
     let parsed = ruff_db::parsed::parsed_module(db, file);
     let module = parsed.load(db);
-    let model = SemanticModel::new(db, file);
 
     // Get the definitions for the symbol at the cursor position
-    let goto_target = find_goto_target(&model, &module, offset)?;
+    let goto_target = find_goto_target(&module, offset)?;
 
     let mode = if include_declaration {
         ReferencesMode::References
@@ -41,7 +39,7 @@ mod tests {
     impl CursorTest {
         fn references(&self) -> String {
             let Some(mut reference_results) =
-                find_references(&self.db, self.cursor.file, self.cursor.offset, true)
+                goto_references(&self.db, self.cursor.file, self.cursor.offset, true)
             else {
                 return "No references found".to_string();
             };
@@ -84,7 +82,7 @@ mod tests {
     }
 
     #[test]
-    fn parameter_references_in_function() {
+    fn test_parameter_references_in_function() {
         let test = cursor_test(
             "
 def calculate_sum(<CURSOR>value: int) -> int:
@@ -149,28 +147,29 @@ result = calculate_sum(value=42)
     }
 
     #[test]
-    fn nonlocal_variable_references() {
+    #[ignore] // TODO: Enable when nonlocal support is fully implemented in goto.rs
+    fn test_nonlocal_variable_references() {
         let test = cursor_test(
             "
 def outer_function():
     coun<CURSOR>ter = 0
-
+    
     def increment():
         nonlocal counter
         counter += 1
         return counter
-
+    
     def decrement():
         nonlocal counter
         counter -= 1
         return counter
-
+    
     # Use counter in outer scope
     initial = counter
     increment()
     decrement()
     final = counter
-
+    
     return increment, decrement
 ",
         );
@@ -182,7 +181,7 @@ def outer_function():
         2 | def outer_function():
         3 |     counter = 0
           |     ^^^^^^^
-        4 |
+        4 |     
         5 |     def increment():
           |
 
@@ -213,7 +212,7 @@ def outer_function():
          7 |         counter += 1
          8 |         return counter
            |                ^^^^^^^
-         9 |
+         9 |     
         10 |     def decrement():
            |
 
@@ -244,7 +243,7 @@ def outer_function():
         12 |         counter -= 1
         13 |         return counter
            |                ^^^^^^^
-        14 |
+        14 |     
         15 |     # Use counter in outer scope
            |
 
@@ -265,14 +264,15 @@ def outer_function():
         18 |     decrement()
         19 |     final = counter
            |             ^^^^^^^
-        20 |
+        20 |     
         21 |     return increment, decrement
            |
         ");
     }
 
     #[test]
-    fn global_variable_references() {
+    #[ignore] // TODO: Enable when global support is fully implemented in goto.rs
+    fn test_global_variable_references() {
         let test = cursor_test(
             "
 glo<CURSOR>bal_counter = 0
@@ -389,7 +389,7 @@ final_value = global_counter
     }
 
     #[test]
-    fn except_handler_variable_references() {
+    fn test_except_handler_variable_references() {
         let test = cursor_test(
             "
 try:
@@ -450,7 +450,7 @@ except ValueError as err:
     }
 
     #[test]
-    fn pattern_match_as_references() {
+    fn test_pattern_match_as_references() {
         let test = cursor_test(
             "
 match x:
@@ -498,7 +498,7 @@ match x:
     }
 
     #[test]
-    fn pattern_match_mapping_rest_references() {
+    fn test_pattern_match_mapping_rest_references() {
         let test = cursor_test(
             "
 match data:
@@ -553,7 +553,7 @@ match data:
     }
 
     #[test]
-    fn function_definition_references() {
+    fn test_function_definition_references() {
         let test = cursor_test(
             "
 def my_func<CURSOR>tion():
@@ -632,7 +632,7 @@ value = my_function
     }
 
     #[test]
-    fn class_definition_references() {
+    fn test_class_definition_references() {
         let test = cursor_test(
             "
 class My<CURSOR>Class:
@@ -711,741 +711,7 @@ cls = MyClass
     }
 
     #[test]
-    fn references_string_annotation1() {
-        let test = cursor_test(
-            r#"
-        a: "MyCla<CURSOR>ss" = 1
-
-        class MyClass:
-            """some docs"""
-        "#,
-        );
-
-        assert_snapshot!(test.references(), @r#"
-        info[references]: Reference 1
-         --> main.py:2:5
-          |
-        2 | a: "MyClass" = 1
-          |     ^^^^^^^
-        3 |
-        4 | class MyClass:
-          |
-
-        info[references]: Reference 2
-         --> main.py:4:7
-          |
-        2 | a: "MyClass" = 1
-        3 |
-        4 | class MyClass:
-          |       ^^^^^^^
-        5 |     """some docs"""
-          |
-        "#);
-    }
-
-    #[test]
-    fn references_string_annotation2() {
-        let test = cursor_test(
-            r#"
-        a: "None | MyCl<CURSOR>ass" = 1
-
-        class MyClass:
-            """some docs"""
-        "#,
-        );
-
-        assert_snapshot!(test.references(), @r#"
-        info[references]: Reference 1
-         --> main.py:2:12
-          |
-        2 | a: "None | MyClass" = 1
-          |            ^^^^^^^
-        3 |
-        4 | class MyClass:
-          |
-
-        info[references]: Reference 2
-         --> main.py:4:7
-          |
-        2 | a: "None | MyClass" = 1
-        3 |
-        4 | class MyClass:
-          |       ^^^^^^^
-        5 |     """some docs"""
-          |
-        "#);
-    }
-
-    #[test]
-    fn references_string_annotation3() {
-        let test = cursor_test(
-            r#"
-        a: "None |<CURSOR> MyClass" = 1
-
-        class MyClass:
-            """some docs"""
-        "#,
-        );
-
-        assert_snapshot!(test.references(), @"No references found");
-    }
-
-    #[test]
-    fn references_string_annotation4() {
-        let test = cursor_test(
-            r#"
-        a: "None | MyClass<CURSOR>" = 1
-
-        class MyClass:
-            """some docs"""
-        "#,
-        );
-
-        assert_snapshot!(test.references(), @r#"
-        info[references]: Reference 1
-         --> main.py:2:12
-          |
-        2 | a: "None | MyClass" = 1
-          |            ^^^^^^^
-        3 |
-        4 | class MyClass:
-          |
-
-        info[references]: Reference 2
-         --> main.py:4:7
-          |
-        2 | a: "None | MyClass" = 1
-        3 |
-        4 | class MyClass:
-          |       ^^^^^^^
-        5 |     """some docs"""
-          |
-        "#);
-    }
-
-    #[test]
-    fn references_string_annotation5() {
-        let test = cursor_test(
-            r#"
-        a: "None | MyClass"<CURSOR> = 1
-
-        class MyClass:
-            """some docs"""
-        "#,
-        );
-
-        assert_snapshot!(test.references(), @"No references found");
-    }
-
-    #[test]
-    fn references_string_annotation_dangling1() {
-        let test = cursor_test(
-            r#"
-        a: "MyCl<CURSOR>ass |" = 1
-
-        class MyClass:
-            """some docs"""
-        "#,
-        );
-
-        assert_snapshot!(test.references(), @"No references found");
-    }
-
-    #[test]
-    fn references_string_annotation_dangling2() {
-        let test = cursor_test(
-            r#"
-        a: "MyCl<CURSOR>ass | No" = 1
-
-        class MyClass:
-            """some docs"""
-        "#,
-        );
-
-        assert_snapshot!(test.references(), @r#"
-        info[references]: Reference 1
-         --> main.py:2:5
-          |
-        2 | a: "MyClass | No" = 1
-          |     ^^^^^^^
-        3 |
-        4 | class MyClass:
-          |
-
-        info[references]: Reference 2
-         --> main.py:4:7
-          |
-        2 | a: "MyClass | No" = 1
-        3 |
-        4 | class MyClass:
-          |       ^^^^^^^
-        5 |     """some docs"""
-          |
-        "#);
-    }
-
-    #[test]
-    fn references_string_annotation_dangling3() {
-        let test = cursor_test(
-            r#"
-        a: "MyClass | N<CURSOR>o" = 1
-
-        class MyClass:
-            """some docs"""
-        "#,
-        );
-
-        assert_snapshot!(test.references(), @"No references found");
-    }
-
-    #[test]
-    fn references_match_name_stmt() {
-        let test = cursor_test(
-            r#"
-            def my_func(command: str):
-                match command.split():
-                    case ["get", a<CURSOR>b]:
-                        x = ab
-            "#,
-        );
-
-        assert_snapshot!(test.references(), @r#"
-        info[references]: Reference 1
-         --> main.py:4:22
-          |
-        2 | def my_func(command: str):
-        3 |     match command.split():
-        4 |         case ["get", ab]:
-          |                      ^^
-        5 |             x = ab
-          |
-
-        info[references]: Reference 2
-         --> main.py:5:17
-          |
-        3 |     match command.split():
-        4 |         case ["get", ab]:
-        5 |             x = ab
-          |                 ^^
-          |
-        "#);
-    }
-
-    #[test]
-    fn references_match_name_binding() {
-        let test = cursor_test(
-            r#"
-            def my_func(command: str):
-                match command.split():
-                    case ["get", ab]:
-                        x = a<CURSOR>b
-            "#,
-        );
-
-        assert_snapshot!(test.references(), @r#"
-        info[references]: Reference 1
-         --> main.py:4:22
-          |
-        2 | def my_func(command: str):
-        3 |     match command.split():
-        4 |         case ["get", ab]:
-          |                      ^^
-        5 |             x = ab
-          |
-
-        info[references]: Reference 2
-         --> main.py:5:17
-          |
-        3 |     match command.split():
-        4 |         case ["get", ab]:
-        5 |             x = ab
-          |                 ^^
-          |
-        "#);
-    }
-
-    #[test]
-    fn references_match_rest_stmt() {
-        let test = cursor_test(
-            r#"
-            def my_func(command: str):
-                match command.split():
-                    case ["get", *a<CURSOR>b]:
-                        x = ab
-            "#,
-        );
-
-        assert_snapshot!(test.references(), @r#"
-        info[references]: Reference 1
-         --> main.py:4:23
-          |
-        2 | def my_func(command: str):
-        3 |     match command.split():
-        4 |         case ["get", *ab]:
-          |                       ^^
-        5 |             x = ab
-          |
-
-        info[references]: Reference 2
-         --> main.py:5:17
-          |
-        3 |     match command.split():
-        4 |         case ["get", *ab]:
-        5 |             x = ab
-          |                 ^^
-          |
-        "#);
-    }
-
-    #[test]
-    fn references_match_rest_binding() {
-        let test = cursor_test(
-            r#"
-            def my_func(command: str):
-                match command.split():
-                    case ["get", *ab]:
-                        x = a<CURSOR>b
-            "#,
-        );
-
-        assert_snapshot!(test.references(), @r#"
-        info[references]: Reference 1
-         --> main.py:4:23
-          |
-        2 | def my_func(command: str):
-        3 |     match command.split():
-        4 |         case ["get", *ab]:
-          |                       ^^
-        5 |             x = ab
-          |
-
-        info[references]: Reference 2
-         --> main.py:5:17
-          |
-        3 |     match command.split():
-        4 |         case ["get", *ab]:
-        5 |             x = ab
-          |                 ^^
-          |
-        "#);
-    }
-
-    #[test]
-    fn references_match_as_stmt() {
-        let test = cursor_test(
-            r#"
-            def my_func(command: str):
-                match command.split():
-                    case ["get", ("a" | "b") as a<CURSOR>b]:
-                        x = ab
-            "#,
-        );
-
-        assert_snapshot!(test.references(), @r#"
-        info[references]: Reference 1
-         --> main.py:4:37
-          |
-        2 | def my_func(command: str):
-        3 |     match command.split():
-        4 |         case ["get", ("a" | "b") as ab]:
-          |                                     ^^
-        5 |             x = ab
-          |
-
-        info[references]: Reference 2
-         --> main.py:5:17
-          |
-        3 |     match command.split():
-        4 |         case ["get", ("a" | "b") as ab]:
-        5 |             x = ab
-          |                 ^^
-          |
-        "#);
-    }
-
-    #[test]
-    fn references_match_as_binding() {
-        let test = cursor_test(
-            r#"
-            def my_func(command: str):
-                match command.split():
-                    case ["get", ("a" | "b") as ab]:
-                        x = a<CURSOR>b
-            "#,
-        );
-
-        assert_snapshot!(test.references(), @r#"
-        info[references]: Reference 1
-         --> main.py:4:37
-          |
-        2 | def my_func(command: str):
-        3 |     match command.split():
-        4 |         case ["get", ("a" | "b") as ab]:
-          |                                     ^^
-        5 |             x = ab
-          |
-
-        info[references]: Reference 2
-         --> main.py:5:17
-          |
-        3 |     match command.split():
-        4 |         case ["get", ("a" | "b") as ab]:
-        5 |             x = ab
-          |                 ^^
-          |
-        "#);
-    }
-
-    #[test]
-    fn references_match_keyword_stmt() {
-        let test = cursor_test(
-            r#"
-            class Click:
-                __match_args__ = ("position", "button")
-                def __init__(self, pos, btn):
-                    self.position: int = pos
-                    self.button: str = btn
-
-            def my_func(event: Click):
-                match event:
-                    case Click(x, button=a<CURSOR>b):
-                        x = ab
-            "#,
-        );
-
-        assert_snapshot!(test.references(), @r"
-        info[references]: Reference 1
-          --> main.py:10:30
-           |
-         8 | def my_func(event: Click):
-         9 |     match event:
-        10 |         case Click(x, button=ab):
-           |                              ^^
-        11 |             x = ab
-           |
-
-        info[references]: Reference 2
-          --> main.py:11:17
-           |
-         9 |     match event:
-        10 |         case Click(x, button=ab):
-        11 |             x = ab
-           |                 ^^
-           |
-        ");
-    }
-
-    #[test]
-    fn references_match_keyword_binding() {
-        let test = cursor_test(
-            r#"
-            class Click:
-                __match_args__ = ("position", "button")
-                def __init__(self, pos, btn):
-                    self.position: int = pos
-                    self.button: str = btn
-
-            def my_func(event: Click):
-                match event:
-                    case Click(x, button=ab):
-                        x = a<CURSOR>b
-            "#,
-        );
-
-        assert_snapshot!(test.references(), @r"
-        info[references]: Reference 1
-          --> main.py:10:30
-           |
-         8 | def my_func(event: Click):
-         9 |     match event:
-        10 |         case Click(x, button=ab):
-           |                              ^^
-        11 |             x = ab
-           |
-
-        info[references]: Reference 2
-          --> main.py:11:17
-           |
-         9 |     match event:
-        10 |         case Click(x, button=ab):
-        11 |             x = ab
-           |                 ^^
-           |
-        ");
-    }
-
-    #[test]
-    fn references_match_class_name() {
-        let test = cursor_test(
-            r#"
-            class Click:
-                __match_args__ = ("position", "button")
-                def __init__(self, pos, btn):
-                    self.position: int = pos
-                    self.button: str = btn
-
-            def my_func(event: Click):
-                match event:
-                    case Cl<CURSOR>ick(x, button=ab):
-                        x = ab
-            "#,
-        );
-
-        assert_snapshot!(test.references(), @r#"
-        info[references]: Reference 1
-         --> main.py:2:7
-          |
-        2 | class Click:
-          |       ^^^^^
-        3 |     __match_args__ = ("position", "button")
-        4 |     def __init__(self, pos, btn):
-          |
-
-        info[references]: Reference 2
-          --> main.py:8:20
-           |
-         6 |         self.button: str = btn
-         7 |
-         8 | def my_func(event: Click):
-           |                    ^^^^^
-         9 |     match event:
-        10 |         case Click(x, button=ab):
-           |
-
-        info[references]: Reference 3
-          --> main.py:10:14
-           |
-         8 | def my_func(event: Click):
-         9 |     match event:
-        10 |         case Click(x, button=ab):
-           |              ^^^^^
-        11 |             x = ab
-           |
-        "#);
-    }
-
-    #[test]
-    fn references_match_class_field_name() {
-        let test = cursor_test(
-            r#"
-            class Click:
-                __match_args__ = ("position", "button")
-                def __init__(self, pos, btn):
-                    self.position: int = pos
-                    self.button: str = btn
-
-            def my_func(event: Click):
-                match event:
-                    case Click(x, but<CURSOR>ton=ab):
-                        x = ab
-            "#,
-        );
-
-        assert_snapshot!(test.references(), @"No references found");
-    }
-
-    #[test]
-    fn references_typevar_name_stmt() {
-        let test = cursor_test(
-            r#"
-            type Alias1[A<CURSOR>B: int = bool] = tuple[AB, list[AB]]
-            "#,
-        );
-
-        assert_snapshot!(test.references(), @r"
-        info[references]: Reference 1
-         --> main.py:2:13
-          |
-        2 | type Alias1[AB: int = bool] = tuple[AB, list[AB]]
-          |             ^^
-          |
-
-        info[references]: Reference 2
-         --> main.py:2:37
-          |
-        2 | type Alias1[AB: int = bool] = tuple[AB, list[AB]]
-          |                                     ^^
-          |
-
-        info[references]: Reference 3
-         --> main.py:2:46
-          |
-        2 | type Alias1[AB: int = bool] = tuple[AB, list[AB]]
-          |                                              ^^
-          |
-        ");
-    }
-
-    #[test]
-    fn references_typevar_name_binding() {
-        let test = cursor_test(
-            r#"
-            type Alias1[AB: int = bool] = tuple[A<CURSOR>B, list[AB]]
-            "#,
-        );
-
-        assert_snapshot!(test.references(), @r"
-        info[references]: Reference 1
-         --> main.py:2:13
-          |
-        2 | type Alias1[AB: int = bool] = tuple[AB, list[AB]]
-          |             ^^
-          |
-
-        info[references]: Reference 2
-         --> main.py:2:37
-          |
-        2 | type Alias1[AB: int = bool] = tuple[AB, list[AB]]
-          |                                     ^^
-          |
-
-        info[references]: Reference 3
-         --> main.py:2:46
-          |
-        2 | type Alias1[AB: int = bool] = tuple[AB, list[AB]]
-          |                                              ^^
-          |
-        ");
-    }
-
-    #[test]
-    fn references_typevar_spec_stmt() {
-        let test = cursor_test(
-            r#"
-            from typing import Callable
-            type Alias2[**A<CURSOR>B = [int, str]] = Callable[AB, tuple[AB]]
-            "#,
-        );
-
-        assert_snapshot!(test.references(), @r"
-        info[references]: Reference 1
-         --> main.py:3:15
-          |
-        2 | from typing import Callable
-        3 | type Alias2[**AB = [int, str]] = Callable[AB, tuple[AB]]
-          |               ^^
-          |
-
-        info[references]: Reference 2
-         --> main.py:3:43
-          |
-        2 | from typing import Callable
-        3 | type Alias2[**AB = [int, str]] = Callable[AB, tuple[AB]]
-          |                                           ^^
-          |
-
-        info[references]: Reference 3
-         --> main.py:3:53
-          |
-        2 | from typing import Callable
-        3 | type Alias2[**AB = [int, str]] = Callable[AB, tuple[AB]]
-          |                                                     ^^
-          |
-        ");
-    }
-
-    #[test]
-    fn references_typevar_spec_binding() {
-        let test = cursor_test(
-            r#"
-            from typing import Callable
-            type Alias2[**AB = [int, str]] = Callable[A<CURSOR>B, tuple[AB]]
-            "#,
-        );
-
-        assert_snapshot!(test.references(), @r"
-        info[references]: Reference 1
-         --> main.py:3:15
-          |
-        2 | from typing import Callable
-        3 | type Alias2[**AB = [int, str]] = Callable[AB, tuple[AB]]
-          |               ^^
-          |
-
-        info[references]: Reference 2
-         --> main.py:3:43
-          |
-        2 | from typing import Callable
-        3 | type Alias2[**AB = [int, str]] = Callable[AB, tuple[AB]]
-          |                                           ^^
-          |
-
-        info[references]: Reference 3
-         --> main.py:3:53
-          |
-        2 | from typing import Callable
-        3 | type Alias2[**AB = [int, str]] = Callable[AB, tuple[AB]]
-          |                                                     ^^
-          |
-        ");
-    }
-
-    #[test]
-    fn references_typevar_tuple_stmt() {
-        let test = cursor_test(
-            r#"
-            type Alias3[*A<CURSOR>B = ()] = tuple[tuple[*AB], tuple[*AB]]
-            "#,
-        );
-
-        assert_snapshot!(test.references(), @r"
-        info[references]: Reference 1
-         --> main.py:2:14
-          |
-        2 | type Alias3[*AB = ()] = tuple[tuple[*AB], tuple[*AB]]
-          |              ^^
-          |
-
-        info[references]: Reference 2
-         --> main.py:2:38
-          |
-        2 | type Alias3[*AB = ()] = tuple[tuple[*AB], tuple[*AB]]
-          |                                      ^^
-          |
-
-        info[references]: Reference 3
-         --> main.py:2:50
-          |
-        2 | type Alias3[*AB = ()] = tuple[tuple[*AB], tuple[*AB]]
-          |                                                  ^^
-          |
-        ");
-    }
-
-    #[test]
-    fn references_typevar_tuple_binding() {
-        let test = cursor_test(
-            r#"
-            type Alias3[*AB = ()] = tuple[tuple[*A<CURSOR>B], tuple[*AB]]
-            "#,
-        );
-
-        assert_snapshot!(test.references(), @r"
-        info[references]: Reference 1
-         --> main.py:2:14
-          |
-        2 | type Alias3[*AB = ()] = tuple[tuple[*AB], tuple[*AB]]
-          |              ^^
-          |
-
-        info[references]: Reference 2
-         --> main.py:2:38
-          |
-        2 | type Alias3[*AB = ()] = tuple[tuple[*AB], tuple[*AB]]
-          |                                      ^^
-          |
-
-        info[references]: Reference 3
-         --> main.py:2:50
-          |
-        2 | type Alias3[*AB = ()] = tuple[tuple[*AB], tuple[*AB]]
-          |                                                  ^^
-          |
-        ");
-    }
-
-    #[test]
-    fn multi_file_function_references() {
+    fn test_multi_file_function_references() {
         let test = CursorTest::builder()
             .source(
                 "utils.py",
@@ -1471,7 +737,7 @@ from utils import func
 class DataProcessor:
     def __init__(self):
         self.multiplier = func
-
+    
     def process(self, value):
         return func(value)
 ",
@@ -1535,14 +801,14 @@ class DataProcessor:
     }
 
     #[test]
-    fn multi_file_class_attribute_references() {
+    fn test_multi_file_class_attribute_references() {
         let test = CursorTest::builder()
             .source(
                 "models.py",
                 "
 class MyModel:
     a<CURSOR>ttr = 42
-
+        
     def get_attribute(self):
         return MyModel.attr
 ",
@@ -1613,7 +879,7 @@ def process_model():
     }
 
     #[test]
-    fn import_alias_references_should_not_resolve_to_original() {
+    fn test_import_alias_references_should_not_resolve_to_original() {
         let test = CursorTest::builder()
             .source(
                 "original.py",

crates/ty_ide/src/goto_type_definition.rs

@@ -11,9 +11,9 @@ pub fn goto_type_definition(
     offset: TextSize,
 ) -> Option<RangedValue<NavigationTargets>> {
     let module = parsed_module(db, file).load(db);
-    let model = SemanticModel::new(db, file);
-    let goto_target = find_goto_target(&model, &module, offset)?;
+    let goto_target = find_goto_target(&module, offset)?;
 
+    let model = SemanticModel::new(db, file);
     let ty = goto_target.inferred_type(&model)?;
 
     tracing::debug!("Inferred type of covering node is {}", ty.display(db));
@@ -285,300 +285,6 @@ mod tests {
         ");
     }
 
-    #[test]
-    fn goto_type_of_import_module() {
-        let mut test = cursor_test(
-            r#"
-            import l<CURSOR>ib
-            "#,
-        );
-
-        test.write_file("lib.py", "a = 10").unwrap();
-
-        assert_snapshot!(test.goto_type_definition(), @r"
-        info[goto-type-definition]: Type definition
-         --> lib.py:1:1
-          |
-        1 | a = 10
-          | ^^^^^^
-          |
-        info: Source
-         --> main.py:2:8
-          |
-        2 | import lib
-          |        ^^^
-          |
-        ");
-    }
-
-    #[test]
-    fn goto_type_of_import_module_multi1() {
-        let mut test = cursor_test(
-            r#"
-            import li<CURSOR>b.submod
-            "#,
-        );
-
-        test.write_file("lib/__init__.py", "b = 7").unwrap();
-        test.write_file("lib/submod.py", "a = 10").unwrap();
-
-        assert_snapshot!(test.goto_type_definition(), @r"
-        info[goto-type-definition]: Type definition
-         --> lib/__init__.py:1:1
-          |
-        1 | b = 7
-          | ^^^^^
-          |
-        info: Source
-         --> main.py:2:8
-          |
-        2 | import lib.submod
-          |        ^^^
-          |
-        ");
-    }
-
-    #[test]
-    fn goto_type_of_import_module_multi2() {
-        let mut test = cursor_test(
-            r#"
-            import lib.subm<CURSOR>od
-            "#,
-        );
-
-        test.write_file("lib/__init__.py", "b = 7").unwrap();
-        test.write_file("lib/submod.py", "a = 10").unwrap();
-
-        assert_snapshot!(test.goto_type_definition(), @r"
-        info[goto-type-definition]: Type definition
-         --> lib/submod.py:1:1
-          |
-        1 | a = 10
-          | ^^^^^^
-          |
-        info: Source
-         --> main.py:2:12
-          |
-        2 | import lib.submod
-          |            ^^^^^^
-          |
-        ");
-    }
-
-    #[test]
-    fn goto_type_of_from_import_module() {
-        let mut test = cursor_test(
-            r#"
-            from l<CURSOR>ib import a
-            "#,
-        );
-
-        test.write_file("lib.py", "a = 10").unwrap();
-
-        assert_snapshot!(test.goto_type_definition(), @r"
-        info[goto-type-definition]: Type definition
-         --> lib.py:1:1
-          |
-        1 | a = 10
-          | ^^^^^^
-          |
-        info: Source
-         --> main.py:2:6
-          |
-        2 | from lib import a
-          |      ^^^
-          |
-        ");
-    }
-
-    #[test]
-    fn goto_type_of_from_import_module_multi1() {
-        let mut test = cursor_test(
-            r#"
-            from li<CURSOR>b.submod import a
-            "#,
-        );
-
-        test.write_file("lib/__init__.py", "b = 7").unwrap();
-        test.write_file("lib/submod.py", "a = 10").unwrap();
-
-        assert_snapshot!(test.goto_type_definition(), @r"
-        info[goto-type-definition]: Type definition
-         --> lib/__init__.py:1:1
-          |
-        1 | b = 7
-          | ^^^^^
-          |
-        info: Source
-         --> main.py:2:6
-          |
-        2 | from lib.submod import a
-          |      ^^^
-          |
-        ");
-    }
-
-    #[test]
-    fn goto_type_of_from_import_module_multi2() {
-        let mut test = cursor_test(
-            r#"
-            from lib.subm<CURSOR>od import a
-            "#,
-        );
-
-        test.write_file("lib/__init__.py", "b = 7").unwrap();
-        test.write_file("lib/submod.py", "a = 10").unwrap();
-
-        assert_snapshot!(test.goto_type_definition(), @r"
-        info[goto-type-definition]: Type definition
-         --> lib/submod.py:1:1
-          |
-        1 | a = 10
-          | ^^^^^^
-          |
-        info: Source
-         --> main.py:2:10
-          |
-        2 | from lib.submod import a
-          |          ^^^^^^
-          |
-        ");
-    }
-
-    #[test]
-    fn goto_type_of_from_import_rel1() {
-        let mut test = CursorTest::builder()
-            .source(
-                "lib/sub/__init__.py",
-                r#"
-            from .bot.bot<CURSOR>mod import *
-            sub = 2
-            "#,
-            )
-            .build();
-
-        test.write_file("lib/__init__.py", "lib = 1").unwrap();
-        // test.write_file("lib/sub/__init__.py", "sub = 2").unwrap();
-        test.write_file("lib/sub/bot/__init__.py", "bot = 3")
-            .unwrap();
-        test.write_file("lib/sub/submod.py", "submod = 21").unwrap();
-        test.write_file("lib/sub/bot/botmod.py", "botmod = 31")
-            .unwrap();
-
-        assert_snapshot!(test.goto_type_definition(), @r"
-        info[goto-type-definition]: Type definition
-         --> lib/sub/bot/botmod.py:1:1
-          |
-        1 | botmod = 31
-          | ^^^^^^^^^^^
-          |
-        info: Source
-         --> lib/sub/__init__.py:2:11
-          |
-        2 | from .bot.botmod import *
-          |           ^^^^^^
-        3 | sub = 2
-          |
-        ");
-    }
-
-    #[test]
-    fn goto_type_of_from_import_rel2() {
-        let mut test = CursorTest::builder()
-            .source(
-                "lib/sub/__init__.py",
-                r#"
-            from .bo<CURSOR>t.botmod import *
-            sub = 2
-            "#,
-            )
-            .build();
-
-        test.write_file("lib/__init__.py", "lib = 1").unwrap();
-        // test.write_file("lib/sub/__init__.py", "sub = 2").unwrap();
-        test.write_file("lib/sub/bot/__init__.py", "bot = 3")
-            .unwrap();
-        test.write_file("lib/sub/submod.py", "submod = 21").unwrap();
-        test.write_file("lib/sub/bot/botmod.py", "botmod = 31")
-            .unwrap();
-
-        assert_snapshot!(test.goto_type_definition(), @r"
-        info[goto-type-definition]: Type definition
-         --> lib/sub/bot/__init__.py:1:1
-          |
-        1 | bot = 3
-          | ^^^^^^^
-          |
-        info: Source
-         --> lib/sub/__init__.py:2:7
-          |
-        2 | from .bot.botmod import *
-          |       ^^^
-        3 | sub = 2
-          |
-        ");
-    }
-
-    #[test]
-    fn goto_type_of_from_import_rel3() {
-        let mut test = CursorTest::builder()
-            .source(
-                "lib/sub/__init__.py",
-                r#"
-            from .<CURSOR>bot.botmod import *
-            sub = 2
-            "#,
-            )
-            .build();
-
-        test.write_file("lib/__init__.py", "lib = 1").unwrap();
-        // test.write_file("lib/sub/__init__.py", "sub = 2").unwrap();
-        test.write_file("lib/sub/bot/__init__.py", "bot = 3")
-            .unwrap();
-        test.write_file("lib/sub/submod.py", "submod = 21").unwrap();
-        test.write_file("lib/sub/bot/botmod.py", "botmod = 31")
-            .unwrap();
-
-        assert_snapshot!(test.goto_type_definition(), @r"
-        info[goto-type-definition]: Type definition
-         --> lib/sub/bot/__init__.py:1:1
-          |
-        1 | bot = 3
-          | ^^^^^^^
-          |
-        info: Source
-         --> lib/sub/__init__.py:2:7
-          |
-        2 | from .bot.botmod import *
-          |       ^^^
-        3 | sub = 2
-          |
-        ");
-    }
-
-    #[test]
-    fn goto_type_of_from_import_rel4() {
-        let mut test = CursorTest::builder()
-            .source(
-                "lib/sub/__init__.py",
-                r#"
-            from .<CURSOR> import submod
-            sub = 2
-            "#,
-            )
-            .build();
-
-        test.write_file("lib/__init__.py", "lib = 1").unwrap();
-        // test.write_file("lib/sub/__init__.py", "sub = 2").unwrap();
-        test.write_file("lib/sub/bot/__init__.py", "bot = 3")
-            .unwrap();
-        test.write_file("lib/sub/submod.py", "submod = 21").unwrap();
-        test.write_file("lib/sub/bot/botmod.py", "botmod = 31")
-            .unwrap();
-
-        assert_snapshot!(test.goto_type_definition(), @"No goto target found");
-    }
-
     #[test]
     fn goto_type_of_expression_with_module() {
         let mut test = cursor_test(
@@ -744,502 +450,6 @@ mod tests {
         assert_snapshot!(test.goto_type_definition(), @"No type definitions found");
     }
 
-    #[test]
-    fn goto_type_string_annotation1() {
-        let test = cursor_test(
-            r#"
-        a: "MyCla<CURSOR>ss" = 1
-
-        class MyClass:
-            """some docs"""
-        "#,
-        );
-
-        assert_snapshot!(test.goto_type_definition(), @r#"
-        info[goto-type-definition]: Type definition
-         --> main.py:4:7
-          |
-        2 | a: "MyClass" = 1
-        3 |
-        4 | class MyClass:
-          |       ^^^^^^^
-        5 |     """some docs"""
-          |
-        info: Source
-         --> main.py:2:5
-          |
-        2 | a: "MyClass" = 1
-          |     ^^^^^^^
-        3 |
-        4 | class MyClass:
-          |
-        "#);
-    }
-
-    #[test]
-    fn goto_type_string_annotation2() {
-        let test = cursor_test(
-            r#"
-        a: "None | MyCl<CURSOR>ass" = 1
-
-        class MyClass:
-            """some docs"""
-        "#,
-        );
-
-        assert_snapshot!(test.goto_type_definition(), @"No goto target found");
-    }
-
-    #[test]
-    fn goto_type_string_annotation3() {
-        let test = cursor_test(
-            r#"
-        a: "None |<CURSOR> MyClass" = 1
-
-        class MyClass:
-            """some docs"""
-        "#,
-        );
-
-        assert_snapshot!(test.goto_type_definition(), @r#"
-        info[goto-type-definition]: Type definition
-         --> main.py:4:7
-          |
-        2 | a: "None | MyClass" = 1
-        3 |
-        4 | class MyClass:
-          |       ^^^^^^^
-        5 |     """some docs"""
-          |
-        info: Source
-         --> main.py:2:4
-          |
-        2 | a: "None | MyClass" = 1
-          |    ^^^^^^^^^^^^^^^^
-        3 |
-        4 | class MyClass:
-          |
-
-        info[goto-type-definition]: Type definition
-           --> stdlib/types.pyi:950:11
-            |
-        948 | if sys.version_info >= (3, 10):
-        949 |     @final
-        950 |     class NoneType:
-            |           ^^^^^^^^
-        951 |         """The type of the None singleton."""
-            |
-        info: Source
-         --> main.py:2:4
-          |
-        2 | a: "None | MyClass" = 1
-          |    ^^^^^^^^^^^^^^^^
-        3 |
-        4 | class MyClass:
-          |
-        "#);
-    }
-
-    #[test]
-    fn goto_type_string_annotation4() {
-        let test = cursor_test(
-            r#"
-        a: "None | MyClass<CURSOR>" = 1
-
-        class MyClass:
-            """some docs"""
-        "#,
-        );
-
-        assert_snapshot!(test.goto_type_definition(), @"No goto target found");
-    }
-
-    #[test]
-    fn goto_type_string_annotation5() {
-        let test = cursor_test(
-            r#"
-        a: "None | MyClass"<CURSOR> = 1
-
-        class MyClass:
-            """some docs"""
-        "#,
-        );
-
-        assert_snapshot!(test.goto_type_definition(), @r#"
-        info[goto-type-definition]: Type definition
-         --> main.py:4:7
-          |
-        2 | a: "None | MyClass" = 1
-        3 |
-        4 | class MyClass:
-          |       ^^^^^^^
-        5 |     """some docs"""
-          |
-        info: Source
-         --> main.py:2:4
-          |
-        2 | a: "None | MyClass" = 1
-          |    ^^^^^^^^^^^^^^^^
-        3 |
-        4 | class MyClass:
-          |
-
-        info[goto-type-definition]: Type definition
-           --> stdlib/types.pyi:950:11
-            |
-        948 | if sys.version_info >= (3, 10):
-        949 |     @final
-        950 |     class NoneType:
-            |           ^^^^^^^^
-        951 |         """The type of the None singleton."""
-            |
-        info: Source
-         --> main.py:2:4
-          |
-        2 | a: "None | MyClass" = 1
-          |    ^^^^^^^^^^^^^^^^
-        3 |
-        4 | class MyClass:
-          |
-        "#);
-    }
-
-    #[test]
-    fn goto_type_string_annotation_dangling1() {
-        let test = cursor_test(
-            r#"
-        a: "MyCl<CURSOR>ass |" = 1
-
-        class MyClass:
-            """some docs"""
-        "#,
-        );
-
-        assert_snapshot!(test.goto_type_definition(), @r#"
-        info[goto-type-definition]: Type definition
-          --> stdlib/ty_extensions.pyi:20:1
-           |
-        19 | # Types
-        20 | Unknown = object()
-           | ^^^^^^^
-        21 | AlwaysTruthy = object()
-        22 | AlwaysFalsy = object()
-           |
-        info: Source
-         --> main.py:2:4
-          |
-        2 | a: "MyClass |" = 1
-          |    ^^^^^^^^^^^
-        3 |
-        4 | class MyClass:
-          |
-        "#);
-    }
-
-    #[test]
-    fn goto_type_string_annotation_dangling2() {
-        let test = cursor_test(
-            r#"
-        a: "MyCl<CURSOR>ass | No" = 1
-
-        class MyClass:
-            """some docs"""
-        "#,
-        );
-
-        assert_snapshot!(test.goto_type_definition(), @"No goto target found");
-    }
-
-    #[test]
-    fn goto_type_string_annotation_dangling3() {
-        let test = cursor_test(
-            r#"
-        a: "MyClass | N<CURSOR>o" = 1
-
-        class MyClass:
-            """some docs"""
-        "#,
-        );
-
-        assert_snapshot!(test.goto_type_definition(), @"No goto target found");
-    }
-
-    #[test]
-    fn goto_type_match_name_stmt() {
-        let test = cursor_test(
-            r#"
-            def my_func(command: str):
-                match command.split():
-                    case ["get", a<CURSOR>b]:
-                        x = ab
-            "#,
-        );
-
-        assert_snapshot!(test.goto_type_definition(), @"No goto target found");
-    }
-
-    #[test]
-    fn goto_type_match_name_binding() {
-        let test = cursor_test(
-            r#"
-            def my_func(command: str):
-                match command.split():
-                    case ["get", ab]:
-                        x = a<CURSOR>b
-            "#,
-        );
-
-        assert_snapshot!(test.goto_type_definition(), @"No type definitions found");
-    }
-
-    #[test]
-    fn goto_type_match_rest_stmt() {
-        let test = cursor_test(
-            r#"
-            def my_func(command: str):
-                match command.split():
-                    case ["get", *a<CURSOR>b]:
-                        x = ab
-            "#,
-        );
-
-        assert_snapshot!(test.goto_type_definition(), @"No goto target found");
-    }
-
-    #[test]
-    fn goto_type_match_rest_binding() {
-        let test = cursor_test(
-            r#"
-            def my_func(command: str):
-                match command.split():
-                    case ["get", *ab]:
-                        x = a<CURSOR>b
-            "#,
-        );
-
-        assert_snapshot!(test.goto_type_definition(), @"No type definitions found");
-    }
-
-    #[test]
-    fn goto_type_match_as_stmt() {
-        let test = cursor_test(
-            r#"
-            def my_func(command: str):
-                match command.split():
-                    case ["get", ("a" | "b") as a<CURSOR>b]:
-                        x = ab
-            "#,
-        );
-
-        assert_snapshot!(test.goto_type_definition(), @"No goto target found");
-    }
-
-    #[test]
-    fn goto_type_match_as_binding() {
-        let test = cursor_test(
-            r#"
-            def my_func(command: str):
-                match command.split():
-                    case ["get", ("a" | "b") as ab]:
-                        x = a<CURSOR>b
-            "#,
-        );
-
-        assert_snapshot!(test.goto_type_definition(), @"No type definitions found");
-    }
-
-    #[test]
-    fn goto_type_match_keyword_stmt() {
-        let test = cursor_test(
-            r#"
-            class Click:
-                __match_args__ = ("position", "button")
-                def __init__(self, pos, btn):
-                    self.position: int = pos
-                    self.button: str = btn
-            
-            def my_func(event: Click):
-                match event:
-                    case Click(x, button=a<CURSOR>b):
-                        x = ab
-            "#,
-        );
-
-        assert_snapshot!(test.goto_type_definition(), @"No goto target found");
-    }
-
-    #[test]
-    fn goto_type_match_keyword_binding() {
-        let test = cursor_test(
-            r#"
-            class Click:
-                __match_args__ = ("position", "button")
-                def __init__(self, pos, btn):
-                    self.position: int = pos
-                    self.button: str = btn
-            
-            def my_func(event: Click):
-                match event:
-                    case Click(x, button=ab):
-                        x = a<CURSOR>b
-            "#,
-        );
-
-        assert_snapshot!(test.goto_type_definition(), @"No type definitions found");
-    }
-
-    #[test]
-    fn goto_type_match_class_name() {
-        let test = cursor_test(
-            r#"
-            class Click:
-                __match_args__ = ("position", "button")
-                def __init__(self, pos, btn):
-                    self.position: int = pos
-                    self.button: str = btn
-            
-            def my_func(event: Click):
-                match event:
-                    case Cl<CURSOR>ick(x, button=ab):
-                        x = ab
-            "#,
-        );
-
-        assert_snapshot!(test.goto_type_definition(), @r#"
-        info[goto-type-definition]: Type definition
-         --> main.py:2:7
-          |
-        2 | class Click:
-          |       ^^^^^
-        3 |     __match_args__ = ("position", "button")
-        4 |     def __init__(self, pos, btn):
-          |
-        info: Source
-          --> main.py:10:14
-           |
-         8 | def my_func(event: Click):
-         9 |     match event:
-        10 |         case Click(x, button=ab):
-           |              ^^^^^
-        11 |             x = ab
-           |
-        "#);
-    }
-
-    #[test]
-    fn goto_type_match_class_field_name() {
-        let test = cursor_test(
-            r#"
-            class Click:
-                __match_args__ = ("position", "button")
-                def __init__(self, pos, btn):
-                    self.position: int = pos
-                    self.button: str = btn
-            
-            def my_func(event: Click):
-                match event:
-                    case Click(x, but<CURSOR>ton=ab):
-                        x = ab
-            "#,
-        );
-
-        assert_snapshot!(test.goto_type_definition(), @"No goto target found");
-    }
-
-    #[test]
-    fn goto_type_typevar_name_stmt() {
-        let test = cursor_test(
-            r#"
-            type Alias1[A<CURSOR>B: int = bool] = tuple[AB, list[AB]]
-            "#,
-        );
-
-        assert_snapshot!(test.goto_type_definition(), @r"
-        info[goto-type-definition]: Type definition
-         --> main.py:2:13
-          |
-        2 | type Alias1[AB: int = bool] = tuple[AB, list[AB]]
-          |             ^^
-          |
-        info: Source
-         --> main.py:2:13
-          |
-        2 | type Alias1[AB: int = bool] = tuple[AB, list[AB]]
-          |             ^^
-          |
-        ");
-    }
-
-    #[test]
-    fn goto_type_typevar_name_binding() {
-        let test = cursor_test(
-            r#"
-            type Alias1[AB: int = bool] = tuple[A<CURSOR>B, list[AB]]
-            "#,
-        );
-
-        assert_snapshot!(test.goto_type_definition(), @r"
-        info[goto-type-definition]: Type definition
-         --> main.py:2:13
-          |
-        2 | type Alias1[AB: int = bool] = tuple[AB, list[AB]]
-          |             ^^
-          |
-        info: Source
-         --> main.py:2:37
-          |
-        2 | type Alias1[AB: int = bool] = tuple[AB, list[AB]]
-          |                                     ^^
-          |
-        ");
-    }
-
-    #[test]
-    fn goto_type_typevar_spec_stmt() {
-        let test = cursor_test(
-            r#"
-            from typing import Callable
-            type Alias2[**A<CURSOR>B = [int, str]] = Callable[AB, tuple[AB]]
-            "#,
-        );
-
-        assert_snapshot!(test.goto_type_definition(), @"No goto target found");
-    }
-
-    #[test]
-    fn goto_type_typevar_spec_binding() {
-        let test = cursor_test(
-            r#"
-            from typing import Callable
-            type Alias2[**AB = [int, str]] = Callable[A<CURSOR>B, tuple[AB]]
-            "#,
-        );
-
-        assert_snapshot!(test.goto_type_definition(), @"No type definitions found");
-    }
-
-    #[test]
-    fn goto_type_typevar_tuple_stmt() {
-        let test = cursor_test(
-            r#"
-            type Alias3[*A<CURSOR>B = ()] = tuple[tuple[*AB], tuple[*AB]]
-            "#,
-        );
-
-        assert_snapshot!(test.goto_type_definition(), @"No goto target found");
-    }
-
-    #[test]
-    fn goto_type_typevar_tuple_binding() {
-        let test = cursor_test(
-            r#"
-            type Alias3[*AB = ()] = tuple[tuple[*A<CURSOR>B], tuple[*AB]]
-            "#,
-        );
-
-        assert_snapshot!(test.goto_type_definition(), @"No type definitions found");
-    }
-
     #[test]
     fn goto_type_on_keyword_argument() {
         let test = cursor_test(
@@ -1338,118 +548,6 @@ f(**kwargs<CURSOR>)
         "#);
     }
 
-    #[test]
-    fn goto_type_nonlocal_binding() {
-        let test = cursor_test(
-            r#"
-def outer():
-    x = "outer_value"
-    
-    def inner():
-        nonlocal x
-        x = "modified"
-        return x<CURSOR>  # Should find the nonlocal x declaration in outer scope
-    
-    return inner
-"#,
-        );
-
-        // Should find the variable declaration in the outer scope, not the nonlocal statement
-        assert_snapshot!(test.goto_type_definition(), @r#"
-        info[goto-type-definition]: Type definition
-           --> stdlib/builtins.pyi:915:7
-            |
-        914 | @disjoint_base
-        915 | class str(Sequence[str]):
-            |       ^^^
-        916 |     """str(object='') -> str
-        917 |     str(bytes_or_buffer[, encoding[, errors]]) -> str
-            |
-        info: Source
-          --> main.py:8:16
-           |
-         6 |         nonlocal x
-         7 |         x = "modified"
-         8 |         return x  # Should find the nonlocal x declaration in outer scope
-           |                ^
-         9 |
-        10 |     return inner
-           |
-        "#);
-    }
-
-    #[test]
-    fn goto_type_nonlocal_stmt() {
-        let test = cursor_test(
-            r#"
-def outer():
-    xy = "outer_value"
-    
-    def inner():
-        nonlocal x<CURSOR>y
-        xy = "modified"
-        return x  # Should find the nonlocal x declaration in outer scope
-    
-    return inner
-"#,
-        );
-
-        // Should find the variable declaration in the outer scope, not the nonlocal statement
-        assert_snapshot!(test.goto_type_definition(), @"No goto target found");
-    }
-
-    #[test]
-    fn goto_type_global_binding() {
-        let test = cursor_test(
-            r#"
-global_var = "global_value"
-
-def function():
-    global global_var
-    global_var = "modified"
-    return global_<CURSOR>var  # Should find the global variable declaration
-"#,
-        );
-
-        // Should find the global variable declaration, not the global statement
-        assert_snapshot!(test.goto_type_definition(), @r#"
-        info[goto-type-definition]: Type definition
-           --> stdlib/builtins.pyi:915:7
-            |
-        914 | @disjoint_base
-        915 | class str(Sequence[str]):
-            |       ^^^
-        916 |     """str(object='') -> str
-        917 |     str(bytes_or_buffer[, encoding[, errors]]) -> str
-            |
-        info: Source
-         --> main.py:7:12
-          |
-        5 |     global global_var
-        6 |     global_var = "modified"
-        7 |     return global_var  # Should find the global variable declaration
-          |            ^^^^^^^^^^
-          |
-        "#);
-    }
-
-    #[test]
-    fn goto_type_global_stmt() {
-        let test = cursor_test(
-            r#"
-global_var = "global_value"
-
-def function():
-    global global_<CURSOR>var
-    global_var = "modified"
-    return global_var  # Should find the global variable declaration
-"#,
-        );
-
-        // Should find the global variable declaration, not the global statement
-        assert_snapshot!(test.goto_type_definition(), @"No goto target found");
-    }
-
     #[test]
     fn goto_type_of_expression_with_builtin() {
         let test = cursor_test(

crates/ty_ide/src/hover.rs

@@ -11,8 +11,7 @@ use ty_python_semantic::{DisplaySettings, SemanticModel};
 
 pub fn hover(db: &dyn Db, file: File, offset: TextSize) -> Option<RangedValue<Hover<'_>>> {
     let parsed = parsed_module(db, file).load(db);
-    let model = SemanticModel::new(db, file);
-    let goto_target = find_goto_target(&model, &parsed, offset)?;
+    let goto_target = find_goto_target(&parsed, offset)?;
 
     if let GotoTarget::Expression(expr) = goto_target {
         if expr.is_literal_expr() {
@@ -20,9 +19,11 @@ pub fn hover(db: &dyn Db, file: File, offset: TextSize) -> Option<RangedValue<Ho
         }
     }
 
+    let model = SemanticModel::new(db, file);
     let docs = goto_target
         .get_definition_targets(
-            &model,
+            file,
+            db,
             ty_python_semantic::ImportAliasResolution::ResolveAliases,
         )
         .and_then(|definitions| definitions.docstring(db))
@@ -904,191 +905,6 @@ mod tests {
         ");
     }
 
-    #[test]
-    fn hover_string_annotation1() {
-        let test = cursor_test(
-            r#"
-        a: "MyCla<CURSOR>ss" = 1
-
-        class MyClass:
-            """some docs"""
-        "#,
-        );
-
-        assert_snapshot!(test.hover(), @r#"
-        MyClass
-        ---------------------------------------------
-        some docs
-
-        ---------------------------------------------
-        ```python
-        MyClass
-        ```
-        ---
-        some docs
-        ---------------------------------------------
-        info[hover]: Hovered content is
-         --> main.py:2:5
-          |
-        2 | a: "MyClass" = 1
-          |     ^^^^^-^
-          |     |    |
-          |     |    Cursor offset
-          |     source
-        3 |
-        4 | class MyClass:
-          |
-        "#);
-    }
-
-    #[test]
-    fn hover_string_annotation2() {
-        let test = cursor_test(
-            r#"
-        a: "None | MyCl<CURSOR>ass" = 1
-
-        class MyClass:
-            """some docs"""
-        "#,
-        );
-
-        assert_snapshot!(test.hover(), @r#"
-        some docs
-
-        ---------------------------------------------
-        some docs
-        ---------------------------------------------
-        info[hover]: Hovered content is
-         --> main.py:2:12
-          |
-        2 | a: "None | MyClass" = 1
-          |            ^^^^-^^
-          |            |   |
-          |            |   Cursor offset
-          |            source
-        3 |
-        4 | class MyClass:
-          |
-        "#);
-    }
-
-    #[test]
-    fn hover_string_annotation3() {
-        let test = cursor_test(
-            r#"
-        a: "None |<CURSOR> MyClass" = 1
-
-        class MyClass:
-            """some docs"""
-        "#,
-        );
-
-        assert_snapshot!(test.hover(), @"Hover provided no content");
-    }
-
-    #[test]
-    fn hover_string_annotation4() {
-        let test = cursor_test(
-            r#"
-        a: "None | MyClass<CURSOR>" = 1
-
-        class MyClass:
-            """some docs"""
-        "#,
-        );
-
-        assert_snapshot!(test.hover(), @r#"
-        some docs
-
-        ---------------------------------------------
-        some docs
-        ---------------------------------------------
-        info[hover]: Hovered content is
-         --> main.py:2:12
-          |
-        2 | a: "None | MyClass" = 1
-          |            ^^^^^^^- Cursor offset
-          |            |
-          |            source
-        3 |
-        4 | class MyClass:
-          |
-        "#);
-    }
-
-    #[test]
-    fn hover_string_annotation5() {
-        let test = cursor_test(
-            r#"
-        a: "None | MyClass"<CURSOR> = 1
-
-        class MyClass:
-            """some docs"""
-        "#,
-        );
-
-        assert_snapshot!(test.hover(), @"Hover provided no content");
-    }
-
-    #[test]
-    fn hover_string_annotation_dangling1() {
-        let test = cursor_test(
-            r#"
-        a: "MyCl<CURSOR>ass |" = 1
-
-        class MyClass:
-            """some docs"""
-        "#,
-        );
-
-        assert_snapshot!(test.hover(), @"Hover provided no content");
-    }
-
-    #[test]
-    fn hover_string_annotation_dangling2() {
-        let test = cursor_test(
-            r#"
-        a: "MyCl<CURSOR>ass | No" = 1
-
-        class MyClass:
-            """some docs"""
-        "#,
-        );
-
-        assert_snapshot!(test.hover(), @r#"
-        some docs
-
-        ---------------------------------------------
-        some docs
-        ---------------------------------------------
-        info[hover]: Hovered content is
-         --> main.py:2:5
-          |
-        2 | a: "MyClass | No" = 1
-          |     ^^^^-^^
-          |     |   |
-          |     |   Cursor offset
-          |     source
-        3 |
-        4 | class MyClass:
-          |
-        "#);
-    }
-
-    #[test]
-    fn hover_string_annotation_dangling3() {
-        let test = cursor_test(
-            r#"
-        a: "MyClass | N<CURSOR>o" = 1
-
-        class MyClass:
-            """some docs"""
-        "#,
-        );
-
-        assert_snapshot!(test.hover(), @"Hover provided no content");
-    }
-
     #[test]
     fn hover_overload_type_disambiguated1() {
         let test = CursorTest::builder()
@@ -1648,509 +1464,6 @@ def ab(a: int, *, c: int):
         ");
     }
 
-    #[test]
-    fn hover_nonlocal_binding() {
-        let test = cursor_test(
-            r#"
-def outer():
-    x = "outer_value"
-    
-    def inner():
-        nonlocal x
-        x = "modified"
-        return x<CURSOR>  # Should find the nonlocal x declaration in outer scope
-    
-    return inner
-"#,
-        );
-
-        // Should find the variable declaration in the outer scope, not the nonlocal statement
-        assert_snapshot!(test.hover(), @r#"
-        Literal["modified"]
-        ---------------------------------------------
-        ```python
-        Literal["modified"]
-        ```
-        ---------------------------------------------
-        info[hover]: Hovered content is
-          --> main.py:8:16
-           |
-         6 |         nonlocal x
-         7 |         x = "modified"
-         8 |         return x  # Should find the nonlocal x declaration in outer scope
-           |                ^- Cursor offset
-           |                |
-           |                source
-         9 |
-        10 |     return inner
-           |
-        "#);
-    }
-
-    #[test]
-    fn hover_nonlocal_stmt() {
-        let test = cursor_test(
-            r#"
-def outer():
-    xy = "outer_value"
-    
-    def inner():
-        nonlocal x<CURSOR>y
-        xy = "modified"
-        return x  # Should find the nonlocal x declaration in outer scope
-    
-    return inner
-"#,
-        );
-
-        // Should find the variable declaration in the outer scope, not the nonlocal statement
-        assert_snapshot!(test.hover(), @"Hover provided no content");
-    }
-
-    #[test]
-    fn hover_global_binding() {
-        let test = cursor_test(
-            r#"
-global_var = "global_value"
-
-def function():
-    global global_var
-    global_var = "modified"
-    return global_<CURSOR>var  # Should find the global variable declaration
-"#,
-        );
-
-        // Should find the global variable declaration, not the global statement
-        assert_snapshot!(test.hover(), @r#"
-        Literal["modified"]
-        ---------------------------------------------
-        ```python
-        Literal["modified"]
-        ```
-        ---------------------------------------------
-        info[hover]: Hovered content is
-         --> main.py:7:12
-          |
-        5 |     global global_var
-        6 |     global_var = "modified"
-        7 |     return global_var  # Should find the global variable declaration
-          |            ^^^^^^^-^^
-          |            |      |
-          |            |      Cursor offset
-          |            source
-          |
-        "#);
-    }
-
-    #[test]
-    fn hover_global_stmt() {
-        let test = cursor_test(
-            r#"
-global_var = "global_value"
-
-def function():
-    global global_<CURSOR>var
-    global_var = "modified"
-    return global_var  # Should find the global variable declaration
-"#,
-        );
-
-        // Should find the global variable declaration, not the global statement
-        assert_snapshot!(test.hover(), @"Hover provided no content");
-    }
-
-    #[test]
-    fn hover_match_name_stmt() {
-        let test = cursor_test(
-            r#"
-            def my_func(command: str):
-                match command.split():
-                    case ["get", a<CURSOR>b]:
-                        x = ab
-            "#,
-        );
-
-        assert_snapshot!(test.hover(), @"Hover provided no content");
-    }
-
-    #[test]
-    fn hover_match_name_binding() {
-        let test = cursor_test(
-            r#"
-            def my_func(command: str):
-                match command.split():
-                    case ["get", ab]:
-                        x = a<CURSOR>b
-            "#,
-        );
-
-        assert_snapshot!(test.hover(), @r#"
-        @Todo
-        ---------------------------------------------
-        ```python
-        @Todo
-        ```
-        ---------------------------------------------
-        info[hover]: Hovered content is
-         --> main.py:5:17
-          |
-        3 |     match command.split():
-        4 |         case ["get", ab]:
-        5 |             x = ab
-          |                 ^-
-          |                 ||
-          |                 |Cursor offset
-          |                 source
-          |
-        "#);
-    }
-
-    #[test]
-    fn hover_match_rest_stmt() {
-        let test = cursor_test(
-            r#"
-            def my_func(command: str):
-                match command.split():
-                    case ["get", *a<CURSOR>b]:
-                        x = ab
-            "#,
-        );
-
-        assert_snapshot!(test.hover(), @"Hover provided no content");
-    }
-
-    #[test]
-    fn hover_match_rest_binding() {
-        let test = cursor_test(
-            r#"
-            def my_func(command: str):
-                match command.split():
-                    case ["get", *ab]:
-                        x = a<CURSOR>b
-            "#,
-        );
-
-        assert_snapshot!(test.hover(), @r#"
-        @Todo
-        ---------------------------------------------
-        ```python
-        @Todo
-        ```
-        ---------------------------------------------
-        info[hover]: Hovered content is
-         --> main.py:5:17
-          |
-        3 |     match command.split():
-        4 |         case ["get", *ab]:
-        5 |             x = ab
-          |                 ^-
-          |                 ||
-          |                 |Cursor offset
-          |                 source
-          |
-        "#);
-    }
-
-    #[test]
-    fn hover_match_as_stmt() {
-        let test = cursor_test(
-            r#"
-            def my_func(command: str):
-                match command.split():
-                    case ["get", ("a" | "b") as a<CURSOR>b]:
-                        x = ab
-            "#,
-        );
-
-        assert_snapshot!(test.hover(), @"Hover provided no content");
-    }
-
-    #[test]
-    fn hover_match_as_binding() {
-        let test = cursor_test(
-            r#"
-            def my_func(command: str):
-                match command.split():
-                    case ["get", ("a" | "b") as ab]:
-                        x = a<CURSOR>b
-            "#,
-        );
-
-        assert_snapshot!(test.hover(), @r#"
-        @Todo
-        ---------------------------------------------
-        ```python
-        @Todo
-        ```
-        ---------------------------------------------
-        info[hover]: Hovered content is
-         --> main.py:5:17
-          |
-        3 |     match command.split():
-        4 |         case ["get", ("a" | "b") as ab]:
-        5 |             x = ab
-          |                 ^-
-          |                 ||
-          |                 |Cursor offset
-          |                 source
-          |
-        "#);
-    }
-
-    #[test]
-    fn hover_match_keyword_stmt() {
-        let test = cursor_test(
-            r#"
-            class Click:
-                __match_args__ = ("position", "button")
-                def __init__(self, pos, btn):
-                    self.position: int = pos
-                    self.button: str = btn
-            
-            def my_func(event: Click):
-                match event:
-                    case Click(x, button=a<CURSOR>b):
-                        x = ab
-            "#,
-        );
-
-        assert_snapshot!(test.hover(), @"Hover provided no content");
-    }
-
-    #[test]
-    fn hover_match_keyword_binding() {
-        let test = cursor_test(
-            r#"
-            class Click:
-                __match_args__ = ("position", "button")
-                def __init__(self, pos, btn):
-                    self.position: int = pos
-                    self.button: str = btn
-            
-            def my_func(event: Click):
-                match event:
-                    case Click(x, button=ab):
-                        x = a<CURSOR>b
-            "#,
-        );
-
-        assert_snapshot!(test.hover(), @r"
-        @Todo
-        ---------------------------------------------
-        ```python
-        @Todo
-        ```
-        ---------------------------------------------
-        info[hover]: Hovered content is
-          --> main.py:11:17
-           |
-         9 |     match event:
-        10 |         case Click(x, button=ab):
-        11 |             x = ab
-           |                 ^-
-           |                 ||
-           |                 |Cursor offset
-           |                 source
-           |
-        ");
-    }
-
-    #[test]
-    fn hover_match_class_name() {
-        let test = cursor_test(
-            r#"
-            class Click:
-                __match_args__ = ("position", "button")
-                def __init__(self, pos, btn):
-                    self.position: int = pos
-                    self.button: str = btn
-            
-            def my_func(event: Click):
-                match event:
-                    case Cl<CURSOR>ick(x, button=ab):
-                        x = ab
-            "#,
-        );
-
-        assert_snapshot!(test.hover(), @r"
-        <class 'Click'>
-        ---------------------------------------------
-        ```python
-        <class 'Click'>
-        ```
-        ---------------------------------------------
-        info[hover]: Hovered content is
-          --> main.py:10:14
-           |
-         8 | def my_func(event: Click):
-         9 |     match event:
-        10 |         case Click(x, button=ab):
-           |              ^^-^^
-           |              | |
-           |              | Cursor offset
-           |              source
-        11 |             x = ab
-           |
-        ");
-    }
-
-    #[test]
-    fn hover_match_class_field_name() {
-        let test = cursor_test(
-            r#"
-            class Click:
-                __match_args__ = ("position", "button")
-                def __init__(self, pos, btn):
-                    self.position: int = pos
-                    self.button: str = btn
-            
-            def my_func(event: Click):
-                match event:
-                    case Click(x, but<CURSOR>ton=ab):
-                        x = ab
-            "#,
-        );
-
-        assert_snapshot!(test.hover(), @"Hover provided no content");
-    }
-
-    #[test]
-    fn hover_typevar_name_stmt() {
-        let test = cursor_test(
-            r#"
-            type Alias1[A<CURSOR>B: int = bool] = tuple[AB, list[AB]]
-            "#,
-        );
-
-        assert_snapshot!(test.hover(), @r"
-        AB@Alias1 (invariant)
-        ---------------------------------------------
-        ```python
-        AB@Alias1 (invariant)
-        ```
-        ---------------------------------------------
-        info[hover]: Hovered content is
-         --> main.py:2:13
-          |
-        2 | type Alias1[AB: int = bool] = tuple[AB, list[AB]]
-          |             ^-
-          |             ||
-          |             |Cursor offset
-          |             source
-          |
-        ");
-    }
-
-    #[test]
-    fn hover_typevar_name_binding() {
-        let test = cursor_test(
-            r#"
-            type Alias1[AB: int = bool] = tuple[A<CURSOR>B, list[AB]]
-            "#,
-        );
-
-        assert_snapshot!(test.hover(), @r"
-        AB@Alias1 (invariant)
-        ---------------------------------------------
-        ```python
-        AB@Alias1 (invariant)
-        ```
-        ---------------------------------------------
-        info[hover]: Hovered content is
-         --> main.py:2:37
-          |
-        2 | type Alias1[AB: int = bool] = tuple[AB, list[AB]]
-          |                                     ^-
-          |                                     ||
-          |                                     |Cursor offset
-          |                                     source
-          |
-        ");
-    }
-
-    #[test]
-    fn hover_typevar_spec_stmt() {
-        let test = cursor_test(
-            r#"
-            from typing import Callable
-            type Alias2[**A<CURSOR>B = [int, str]] = Callable[AB, tuple[AB]]
-            "#,
-        );
-
-        assert_snapshot!(test.hover(), @"Hover provided no content");
-    }
-
-    #[test]
-    fn hover_typevar_spec_binding() {
-        let test = cursor_test(
-            r#"
-            from typing import Callable
-            type Alias2[**AB = [int, str]] = Callable[A<CURSOR>B, tuple[AB]]
-            "#,
-        );
-
-        assert_snapshot!(test.hover(), @r"
-        (
-            ...
-        ) -> tuple[typing.ParamSpec]
-        ---------------------------------------------
-        ```python
-        (
-            ...
-        ) -> tuple[typing.ParamSpec]
-        ```
-        ---------------------------------------------
-        info[hover]: Hovered content is
-         --> main.py:3:43
-          |
-        2 | from typing import Callable
-        3 | type Alias2[**AB = [int, str]] = Callable[AB, tuple[AB]]
-          |                                           ^-
-          |                                           ||
-          |                                           |Cursor offset
-          |                                           source
-          |
-        ");
-    }
-
-    #[test]
-    fn hover_typevar_tuple_stmt() {
-        let test = cursor_test(
-            r#"
-            type Alias3[*A<CURSOR>B = ()] = tuple[tuple[*AB], tuple[*AB]]
-            "#,
-        );
-
-        assert_snapshot!(test.hover(), @"Hover provided no content");
-    }
-
-    #[test]
-    fn hover_typevar_tuple_binding() {
-        let test = cursor_test(
-            r#"
-            type Alias3[*AB = ()] = tuple[tuple[*A<CURSOR>B], tuple[*AB]]
-            "#,
-        );
-
-        assert_snapshot!(test.hover(), @r"
-        @Todo
-        ---------------------------------------------
-        ```python
-        @Todo
-        ```
-        ---------------------------------------------
-        info[hover]: Hovered content is
-         --> main.py:2:38
-          |
-        2 | type Alias3[*AB = ()] = tuple[tuple[*AB], tuple[*AB]]
-          |                                      ^-
-          |                                      ||
-          |                                      |Cursor offset
-          |                                      source
-          |
-        ");
-    }
-
     #[test]
     fn hover_module_import() {
         let mut test = cursor_test(
@@ -2175,17 +1488,11 @@ def function():
         .unwrap();
 
         assert_snapshot!(test.hover(), @r"
-        <module 'lib'>
-        ---------------------------------------------
         The cool lib_py module!
 
         Wow this module rocks.
 
         ---------------------------------------------
-        ```python
-        <module 'lib'>
-        ```
-        ---
         The cool lib/_py module!  
           
         Wow this module rocks.

crates/ty_ide/src/inlay_hints.rs

@@ -6,8 +6,8 @@ use ruff_db::parsed::parsed_module;
 use ruff_python_ast::visitor::source_order::{self, SourceOrderVisitor, TraversalSignal};
 use ruff_python_ast::{AnyNodeRef, ArgOrKeyword, Expr, ExprUnaryOp, Stmt, UnaryOp};
 use ruff_text_size::{Ranged, TextRange, TextSize};
+use ty_python_semantic::types::Type;
 use ty_python_semantic::types::ide_support::inlay_hint_call_argument_details;
-use ty_python_semantic::types::{Type, TypeDetail};
 use ty_python_semantic::{HasType, SemanticModel};
 
 #[derive(Debug, Clone)]
@@ -15,12 +15,10 @@ pub struct InlayHint {
     pub position: TextSize,
     pub kind: InlayHintKind,
     pub label: InlayHintLabel,
-    pub text_edits: Vec<InlayHintTextEdit>,
 }
 
 impl InlayHint {
-    fn variable_type(expr: &Expr, ty: Type, db: &dyn Db, allow_edits: bool) -> Self {
-        let position = expr.range().end();
+    fn variable_type(position: TextSize, ty: Type, db: &dyn Db) -> Self {
         // Render the type to a string, and get subspans for all the types that make it up
         let details = ty.display(db).to_string_parts();
 
@@ -36,7 +34,7 @@ impl InlayHint {
         let mut label_parts = vec![": ".into()];
         for (target, detail) in details.targets.iter().zip(&details.details) {
             match detail {
-                TypeDetail::Type(ty) => {
+                ty_python_semantic::types::TypeDetail::Type(ty) => {
                     let start = target.start().to_usize();
                     let end = target.end().to_usize();
                     // If we skipped over some bytes, push them with no target
@@ -52,9 +50,9 @@ impl InlayHint {
                         offset = end;
                     }
                 }
-                TypeDetail::SignatureStart
-                | TypeDetail::SignatureEnd
-                | TypeDetail::Parameter(_) => {
+                ty_python_semantic::types::TypeDetail::SignatureStart
+                | ty_python_semantic::types::TypeDetail::SignatureEnd
+                | ty_python_semantic::types::TypeDetail::Parameter(_) => {
                     // Don't care about these
                 }
             }
@@ -64,20 +62,10 @@ impl InlayHint {
             label_parts.push(details.label[offset..details.label.len()].into());
         }
 
-        let text_edits = if details.is_valid_syntax && allow_edits {
-            vec![InlayHintTextEdit {
-                range: TextRange::new(position, position),
-                new_text: format!(": {}", details.label),
-            }]
-        } else {
-            vec![]
-        };
-
         Self {
             position,
             kind: InlayHintKind::Type,
             label: InlayHintLabel { parts: label_parts },
-            text_edits,
         }
     }
 
@@ -95,7 +83,6 @@ impl InlayHint {
             position,
             kind: InlayHintKind::CallArgumentName,
             label: InlayHintLabel { parts: label_parts },
-            text_edits: vec![],
         }
     }
 
@@ -188,12 +175,6 @@ impl From<&str> for InlayHintLabelPart {
     }
 }
 
-#[derive(Debug, Clone)]
-pub struct InlayHintTextEdit {
-    pub range: TextRange,
-    pub new_text: String,
-}
-
 pub fn inlay_hints(
     db: &dyn Db,
     file: File,
@@ -253,7 +234,6 @@ struct InlayHintVisitor<'a, 'db> {
     in_assignment: bool,
     range: TextRange,
     settings: &'a InlayHintSettings,
-    in_no_edits_allowed: bool,
 }
 
 impl<'a, 'db> InlayHintVisitor<'a, 'db> {
@@ -265,16 +245,15 @@ impl<'a, 'db> InlayHintVisitor<'a, 'db> {
             in_assignment: false,
             range,
             settings,
-            in_no_edits_allowed: false,
         }
     }
 
-    fn add_type_hint(&mut self, expr: &Expr, ty: Type<'db>, allow_edits: bool) {
+    fn add_type_hint(&mut self, position: TextSize, ty: Type<'db>) {
         if !self.settings.variable_types {
             return;
         }
 
-        let inlay_hint = InlayHint::variable_type(expr, ty, self.db, allow_edits);
+        let inlay_hint = InlayHint::variable_type(position, ty, self.db);
 
         self.hints.push(inlay_hint);
     }
@@ -318,13 +297,9 @@ impl SourceOrderVisitor<'_> for InlayHintVisitor<'_, '_> {
         match stmt {
             Stmt::Assign(assign) => {
                 self.in_assignment = !type_hint_is_excessive_for_expr(&assign.value);
-                if !annotations_are_valid_syntax(assign) {
-                    self.in_no_edits_allowed = true;
-                }
                 for target in &assign.targets {
                     self.visit_expr(target);
                 }
-                self.in_no_edits_allowed = false;
                 self.in_assignment = false;
 
                 self.visit_expr(&assign.value);
@@ -350,7 +325,7 @@ impl SourceOrderVisitor<'_> for InlayHintVisitor<'_, '_> {
                 if self.in_assignment {
                     if name.ctx.is_store() {
                         let ty = expr.inferred_type(&self.model);
-                        self.add_type_hint(expr, ty, !self.in_no_edits_allowed);
+                        self.add_type_hint(expr.range().end(), ty);
                     }
                 }
                 source_order::walk_expr(self, expr);
@@ -359,7 +334,7 @@ impl SourceOrderVisitor<'_> for InlayHintVisitor<'_, '_> {
                 if self.in_assignment {
                     if attribute.ctx.is_store() {
                         let ty = expr.inferred_type(&self.model);
-                        self.add_type_hint(expr, ty, !self.in_no_edits_allowed);
+                        self.add_type_hint(expr.range().end(), ty);
                     }
                 }
                 source_order::walk_expr(self, expr);
@@ -445,22 +420,6 @@ fn type_hint_is_excessive_for_expr(expr: &Expr) -> bool {
     }
 }
 
-fn annotations_are_valid_syntax(stmt_assign: &ruff_python_ast::StmtAssign) -> bool {
-    if stmt_assign.targets.len() > 1 {
-        return false;
-    }
-
-    if stmt_assign
-        .targets
-        .iter()
-        .any(|target| matches!(target, Expr::Tuple(_)))
-    {
-        return false;
-    }
-
-    true
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;
@@ -468,7 +427,6 @@ mod tests {
     use crate::NavigationTarget;
     use crate::tests::IntoDiagnostic;
     use insta::{assert_snapshot, internals::SettingsBindDropGuard};
-    use itertools::Itertools;
     use ruff_db::{
         diagnostic::{
             Annotation, Diagnostic, DiagnosticFormat, DiagnosticId, DisplayDiagnosticConfig,
@@ -559,15 +517,12 @@ mod tests {
         fn inlay_hints_with_settings(&mut self, settings: &InlayHintSettings) -> String {
             let hints = inlay_hints(&self.db, self.file, self.range, settings);
 
-            let mut inlay_hint_buf = source_text(&self.db, self.file).as_str().to_string();
-            let mut text_edit_buf = inlay_hint_buf.clone();
+            let mut buf = source_text(&self.db, self.file).as_str().to_string();
 
             let mut tbd_diagnostics = Vec::new();
 
             let mut offset = 0;
 
-            let mut edit_offset = 0;
-
             for hint in hints {
                 let end_position = hint.position.to_usize() + offset;
                 let mut hint_str = "[".to_string();
@@ -583,65 +538,36 @@ mod tests {
                     hint_str.push_str(part.text());
                 }
 
-                for edit in hint.text_edits {
-                    let start = edit.range.start().to_usize() + edit_offset;
-                    let end = edit.range.end().to_usize() + edit_offset;
-
-                    text_edit_buf.replace_range(start..end, &edit.new_text);
-
-                    if start == end {
-                        edit_offset += edit.new_text.len();
-                    } else {
-                        edit_offset += edit.new_text.len() - edit.range.len().to_usize();
-                    }
-                }
-
                 hint_str.push(']');
                 offset += hint_str.len();
 
-                inlay_hint_buf.insert_str(end_position, &hint_str);
+                buf.insert_str(end_position, &hint_str);
             }
 
-            self.db.write_file("main2.py", &inlay_hint_buf).unwrap();
+            self.db.write_file("main2.py", &buf).unwrap();
             let inlayed_file =
                 system_path_to_file(&self.db, "main2.py").expect("newly written file to existing");
 
-            let location_diagnostics = tbd_diagnostics.into_iter().map(|(label_range, target)| {
+            let diagnostics = tbd_diagnostics.into_iter().map(|(label_range, target)| {
                 InlayHintLocationDiagnostic::new(FileRange::new(inlayed_file, label_range), &target)
             });
 
-            let mut rendered_diagnostics = location_diagnostics
-                .map(|diagnostic| self.render_diagnostic(diagnostic))
-                .join("");
+            let mut rendered_diagnostics = self.render_diagnostics(diagnostics);
 
             if !rendered_diagnostics.is_empty() {
                 rendered_diagnostics = format!(
                     "{}{}",
                     crate::MarkupKind::PlainText.horizontal_line(),
                     rendered_diagnostics
-                        .strip_suffix("\n")
-                        .unwrap_or(&rendered_diagnostics)
                 );
             }
 
-            let rendered_edit_diagnostic = if edit_offset != 0 {
-                let edit_diagnostic = InlayHintEditDiagnostic::new(text_edit_buf);
-                let text_edit_buf = self.render_diagnostic(edit_diagnostic);
-
-                format!(
-                    "{}{}",
-                    crate::MarkupKind::PlainText.horizontal_line(),
-                    text_edit_buf
-                )
-            } else {
-                String::new()
-            };
-
-            format!("{inlay_hint_buf}{rendered_diagnostics}{rendered_edit_diagnostic}",)
+            format!("{buf}{rendered_diagnostics}",)
         }
 
-        fn render_diagnostic<D>(&self, diagnostic: D) -> String
+        fn render_diagnostics<I, D>(&self, diagnostics: I) -> String
         where
+            I: IntoIterator<Item = D>,
             D: IntoDiagnostic,
         {
             use std::fmt::Write;
@@ -652,8 +578,10 @@ mod tests {
                 .color(false)
                 .format(DiagnosticFormat::Full);
 
-            let diag = diagnostic.into_diagnostic();
-            write!(buf, "{}", diag.display(&self.db, &config)).unwrap();
+            for diagnostic in diagnostics {
+                let diag = diagnostic.into_diagnostic();
+                write!(buf, "{}", diag.display(&self.db, &config)).unwrap();
+            }
 
             buf
         }
@@ -800,20 +728,6 @@ mod tests {
         10 | bb[: Literal[b"foo"]] = aa
            |              ^^^^^^
            |
-
-        ---------------------------------------------
-        info[inlay-hint-edit]: File after edits
-        info: Source
-
-        def i(x: int, /) -> int:
-            return x
-
-        x = 1
-        y: Literal[1] = x
-        z: int = i(1)
-        w: int = z
-        aa = b'foo'
-        bb: Literal[b"foo"] = aa
         "#);
     }
 
@@ -1407,20 +1321,6 @@ mod tests {
         10 | w[: tuple[int, str]] = z
            |                ^^^
            |
-
-        ---------------------------------------------
-        info[inlay-hint-edit]: File after edits
-        info: Source
-
-        def i(x: int, /) -> int:
-            return x
-        def s(x: str, /) -> str:
-            return x
-
-        x = (1, 'abc')
-        y: tuple[Literal[1], Literal["abc"]] = x
-        z: tuple[int, str] = (i(1), s('abc'))
-        w: tuple[int, str] = z
         "#);
     }
 
@@ -1754,18 +1654,6 @@ mod tests {
         8 | w[: int] = z
           |     ^^^
           |
-
-        ---------------------------------------------
-        info[inlay-hint-edit]: File after edits
-        info: Source
-
-        def i(x: int, /) -> int:
-            return x
-
-        x: int = 1
-        y: Literal[1] = x
-        z: int = i(1)
-        w: int = z
         "#);
     }
 
@@ -1803,15 +1691,6 @@ mod tests {
           |     ^^^
         5 | z = x
           |
-
-        ---------------------------------------------
-        info[inlay-hint-edit]: File after edits
-        info: Source
-
-        def i(x: int, /) -> int:
-            return x
-        x: int = i(1)
-        z = x
         "#);
     }
 
@@ -1931,146 +1810,9 @@ mod tests {
         8 | a.y[: int] = int(3)
           |       ^^^
           |
-
-        ---------------------------------------------
-        info[inlay-hint-edit]: File after edits
-        info: Source
-
-        class A:
-            def __init__(self, y):
-                self.x: int = int(1)
-                self.y: Unknown = y
-
-        a: A = A(2)
-        a.y: int = int(3)
         "#);
     }
 
-    #[test]
-    fn test_match_name_binding() {
-        let mut test = inlay_hint_test(
-            r#"
-            def my_func(command: str):
-                match command.split():
-                    case ["get", ab]:
-                        x = ab
-            "#,
-        );
-
-        assert_snapshot!(test.inlay_hints(), @r#"
-        def my_func(command: str):
-            match command.split():
-                case ["get", ab]:
-                    x[: @Todo] = ab
-        "#);
-    }
-
-    #[test]
-    fn test_match_rest_binding() {
-        let mut test = inlay_hint_test(
-            r#"
-            def my_func(command: str):
-                match command.split():
-                    case ["get", *ab]:
-                        x = ab
-            "#,
-        );
-
-        assert_snapshot!(test.inlay_hints(), @r#"
-        def my_func(command: str):
-            match command.split():
-                case ["get", *ab]:
-                    x[: @Todo] = ab
-        "#);
-    }
-
-    #[test]
-    fn test_match_as_binding() {
-        let mut test = inlay_hint_test(
-            r#"
-            def my_func(command: str):
-                match command.split():
-                    case ["get", ("a" | "b") as ab]:
-                        x = ab
-            "#,
-        );
-
-        assert_snapshot!(test.inlay_hints(), @r#"
-        def my_func(command: str):
-            match command.split():
-                case ["get", ("a" | "b") as ab]:
-                    x[: @Todo] = ab
-        "#);
-    }
-
-    #[test]
-    fn test_match_keyword_binding() {
-        let mut test = inlay_hint_test(
-            r#"
-            class Click:
-                __match_args__ = ("position", "button")
-                def __init__(self, pos, btn):
-                    self.position: int = pos
-                    self.button: str = btn
-            
-            def my_func(event: Click):
-                match event:
-                    case Click(x, button=ab):
-                        x = ab
-            "#,
-        );
-
-        assert_snapshot!(test.inlay_hints(), @r#"
-        class Click:
-            __match_args__ = ("position", "button")
-            def __init__(self, pos, btn):
-                self.position: int = pos
-                self.button: str = btn
-
-        def my_func(event: Click):
-            match event:
-                case Click(x, button=ab):
-                    x[: @Todo] = ab
-        "#);
-    }
-
-    #[test]
-    fn test_typevar_name_binding() {
-        let mut test = inlay_hint_test(
-            r#"
-            type Alias1[AB: int = bool] = tuple[AB, list[AB]]
-            "#,
-        );
-
-        assert_snapshot!(test.inlay_hints(), @"type Alias1[AB: int = bool] = tuple[AB, list[AB]]");
-    }
-
-    #[test]
-    fn test_typevar_spec_binding() {
-        let mut test = inlay_hint_test(
-            r#"
-            from typing import Callable
-            type Alias2[**AB = [int, str]] = Callable[AB, tuple[AB]]
-            "#,
-        );
-
-        assert_snapshot!(test.inlay_hints(), @r"
-        from typing import Callable
-        type Alias2[**AB = [int, str]] = Callable[AB, tuple[AB]]
-        ");
-    }
-
-    #[test]
-    fn test_typevar_tuple_binding() {
-        let mut test = inlay_hint_test(
-            r#"
-            type Alias3[*AB = ()] = tuple[tuple[*AB], tuple[*AB]]
-            "#,
-        );
-
-        assert_snapshot!(test.inlay_hints(), @"type Alias3[*AB = ()] = tuple[tuple[*AB], tuple[*AB]]");
-    }
-
     #[test]
     fn test_many_literals() {
         let mut test = inlay_hint_test(
@@ -2898,22 +2640,6 @@ mod tests {
         12 | k[: list[Unknown | int | float]] = [-1, -2.0]
            |                          ^^^^^
            |
-
-        ---------------------------------------------
-        info[inlay-hint-edit]: File after edits
-        info: Source
-
-        a: list[Unknown | int] = [1, 2]
-        b: list[Unknown | float] = [1.0, 2.0]
-        c: list[Unknown | bool] = [True, False]
-        d: list[Unknown | None] = [None, None]
-        e: list[Unknown | str] = ["hel", "lo"]
-        f: list[Unknown | str] = ['the', 're']
-        g: list[Unknown | str] = [f"{ft}", f"{ft}"]
-        h: list[Unknown | Template] = [t"wow %d", t"wow %d"]
-        i: list[Unknown | bytes] = [b'/x01', b'/x02']
-        j: list[Unknown | int | float] = [+1, +2.0]
-        k: list[Unknown | int | float] = [-1, -2.0]
         "#);
     }
 
@@ -3085,19 +2811,6 @@ mod tests {
         9 | c[: MyClass], d[: MyClass] = (MyClass(), MyClass())
           |                   ^^^^^^^
           |
-
-        ---------------------------------------------
-        info[inlay-hint-edit]: File after edits
-        info: Source
-
-        class MyClass:
-            def __init__(self):
-                self.x: int = 1
-
-        x: MyClass = MyClass()
-        y: tuple[MyClass, MyClass] = (MyClass(), MyClass())
-        a, b = MyClass(), MyClass()
-        c, d = (MyClass(), MyClass())
         "#);
     }
 
@@ -3968,20 +3681,6 @@ mod tests {
         10 | c[: MyClass[Unknown | int, str]], d[: MyClass[Unknown | int, str]] = (MyClass([x=][42], [y=]("a", "b")), MyClass([x=][42], [y=]("a", "…
            |                                                                                                                             ^
            |
-
-        ---------------------------------------------
-        info[inlay-hint-edit]: File after edits
-        info: Source
-
-        class MyClass[T, U]:
-            def __init__(self, x: list[T], y: tuple[U, U]):
-                self.x = x
-                self.y = y
-
-        x: MyClass[Unknown | int, str] = MyClass([42], ("a", "b"))
-        y: tuple[MyClass[Unknown | int, str], MyClass[Unknown | int, str]] = (MyClass([42], ("a", "b")), MyClass([42], ("a", "b")))
-        a, b = MyClass([42], ("a", "b")), MyClass([42], ("a", "b"))
-        c, d = (MyClass([42], ("a", "b")), MyClass([42], ("a", "b")))
         "#);
     }
 
@@ -4137,20 +3836,6 @@ mod tests {
         10 | foo([x=]val.y)
            |      ^
            |
-
-        ---------------------------------------------
-        info[inlay-hint-edit]: File after edits
-        info: Source
-
-        def foo(x: int): pass
-        class MyClass:
-            def __init__(self):
-                self.x: int = 1
-                self.y: int = 2
-        val: MyClass = MyClass()
-
-        foo(val.x)
-        foo(val.y)
         ");
     }
 
@@ -4216,20 +3901,6 @@ mod tests {
         10 | foo([x=]x.y)
            |      ^
            |
-
-        ---------------------------------------------
-        info[inlay-hint-edit]: File after edits
-        info: Source
-
-        def foo(x: int): pass
-        class MyClass:
-            def __init__(self):
-                self.x: int = 1
-                self.y: int = 2
-        x: MyClass = MyClass()
-
-        foo(x.x)
-        foo(x.y)
         ");
     }
 
@@ -4298,22 +3969,6 @@ mod tests {
         12 | foo([x=]val.y())
            |      ^
            |
-
-        ---------------------------------------------
-        info[inlay-hint-edit]: File after edits
-        info: Source
-
-        def foo(x: int): pass
-        class MyClass:
-            def __init__(self):
-            def x() -> int:
-                return 1
-            def y() -> int:
-                return 2
-        val: MyClass = MyClass()
-
-        foo(val.x())
-        foo(val.y())
         ");
     }
 
@@ -4388,24 +4043,6 @@ mod tests {
         14 | foo([x=]val.y()[1])
            |      ^
            |
-
-        ---------------------------------------------
-        info[inlay-hint-edit]: File after edits
-        info: Source
-
-        from typing import List
-
-        def foo(x: int): pass
-        class MyClass:
-            def __init__(self):
-            def x() -> List[int]:
-                return 1
-            def y() -> List[int]:
-                return 2
-        val: MyClass = MyClass()
-
-        foo(val.x()[0])
-        foo(val.y()[1])
         ");
     }
 
@@ -4556,17 +4193,6 @@ mod tests {
         7 | foo([x=]y[0])
           |      ^
           |
-
-        ---------------------------------------------
-        info[inlay-hint-edit]: File after edits
-        info: Source
-
-        def foo(x: int): pass
-        x: list[Unknown | int] = [1]
-        y: list[Unknown | int] = [2]
-
-        foo(x[0])
-        foo(y[0])
         "#);
     }
 
@@ -4752,15 +4378,6 @@ mod tests {
         5 | f[: Foo] = Foo([x=]1)
           |                 ^
           |
-
-        ---------------------------------------------
-        info[inlay-hint-edit]: File after edits
-        info: Source
-
-        class Foo:
-            def __init__(self, x: int): pass
-        Foo(1)
-        f: Foo = Foo(1)
         ");
     }
 
@@ -4833,15 +4450,6 @@ mod tests {
         5 | f[: Foo] = Foo([x=]1)
           |                 ^
           |
-
-        ---------------------------------------------
-        info[inlay-hint-edit]: File after edits
-        info: Source
-
-        class Foo:
-            def __new__(cls, x: int): pass
-        Foo(1)
-        f: Foo = Foo(1)
         ");
     }
 
@@ -5589,15 +5197,6 @@ mod tests {
           |         ^^^^^^^^^^^^^
         5 | my_func(x="hello")
           |
-
-        ---------------------------------------------
-        info[inlay-hint-edit]: File after edits
-        info: Source
-
-        from typing import LiteralString
-        def my_func(x: LiteralString):
-            y: LiteralString = x
-        my_func(x="hello")
         "#);
     }
 
@@ -5740,23 +5339,6 @@ mod tests {
         13 |     y[: Literal[1, 2, 3, "hello"] | None] = x
            |                                     ^^^^
            |
-
-        ---------------------------------------------
-        info[inlay-hint-edit]: File after edits
-        info: Source
-
-        def branch(cond: int):
-            if cond < 10:
-                x = 1
-            elif cond < 20:
-                x = 2
-            elif cond < 30:
-                x = 3
-            elif cond < 40:
-                x = "hello"
-            else:
-                x = None
-            y: Literal[1, 2, 3, "hello"] | None = x
         "#);
     }
 
@@ -5872,13 +5454,6 @@ mod tests {
         3 |     y[: type[list[str]]] = type(x)
           |                   ^^^
           |
-
-        ---------------------------------------------
-        info[inlay-hint-edit]: File after edits
-        info: Source
-
-        def f(x: list[str]):
-            y: type[list[str]] = type(x)
         "#);
     }
 
@@ -5918,16 +5493,6 @@ mod tests {
         6 | ab[: property] = F.whatever
           |      ^^^^^^^^
           |
-
-        ---------------------------------------------
-        info[inlay-hint-edit]: File after edits
-        info: Source
-
-        class F:
-            @property
-            def whatever(self): ...
-
-        ab: property = F.whatever
         ");
     }
 
@@ -6245,196 +5810,6 @@ mod tests {
         ");
     }
 
-    #[test]
-    fn test_function_signature_inlay_hint() {
-        let mut test = inlay_hint_test(
-            "
-                  def foo(x: int, *y: bool, z: str | int | list[str]): ...
-
-                  a = foo",
-        );
-
-        assert_snapshot!(test.inlay_hints(), @r#"
-        def foo(x: int, *y: bool, z: str | int | list[str]): ...
-
-        a[: def foo(x: int, *y: bool, *, z: str | int | list[str]) -> Unknown] = foo
-        ---------------------------------------------
-        info[inlay-hint-location]: Inlay Hint Target
-           --> stdlib/builtins.pyi:348:7
-            |
-        347 | @disjoint_base
-        348 | class int:
-            |       ^^^
-        349 |     """int([x]) -> integer
-        350 |     int(x, base=10) -> integer
-            |
-        info: Source
-         --> main2.py:4:16
-          |
-        2 | def foo(x: int, *y: bool, z: str | int | list[str]): ...
-        3 |
-        4 | a[: def foo(x: int, *y: bool, *, z: str | int | list[str]) -> Unknown] = foo
-          |                ^^^
-          |
-
-        info[inlay-hint-location]: Inlay Hint Target
-            --> stdlib/builtins.pyi:2591:7
-             |
-        2590 | @final
-        2591 | class bool(int):
-             |       ^^^^
-        2592 |     """Returns True when the argument is true, False otherwise.
-        2593 |     The builtins True and False are the only two instances of the class bool.
-             |
-        info: Source
-         --> main2.py:4:25
-          |
-        2 | def foo(x: int, *y: bool, z: str | int | list[str]): ...
-        3 |
-        4 | a[: def foo(x: int, *y: bool, *, z: str | int | list[str]) -> Unknown] = foo
-          |                         ^^^^
-          |
-
-        info[inlay-hint-location]: Inlay Hint Target
-           --> stdlib/builtins.pyi:915:7
-            |
-        914 | @disjoint_base
-        915 | class str(Sequence[str]):
-            |       ^^^
-        916 |     """str(object='') -> str
-        917 |     str(bytes_or_buffer[, encoding[, errors]]) -> str
-            |
-        info: Source
-         --> main2.py:4:37
-          |
-        2 | def foo(x: int, *y: bool, z: str | int | list[str]): ...
-        3 |
-        4 | a[: def foo(x: int, *y: bool, *, z: str | int | list[str]) -> Unknown] = foo
-          |                                     ^^^
-          |
-
-        info[inlay-hint-location]: Inlay Hint Target
-           --> stdlib/builtins.pyi:348:7
-            |
-        347 | @disjoint_base
-        348 | class int:
-            |       ^^^
-        349 |     """int([x]) -> integer
-        350 |     int(x, base=10) -> integer
-            |
-        info: Source
-         --> main2.py:4:43
-          |
-        2 | def foo(x: int, *y: bool, z: str | int | list[str]): ...
-        3 |
-        4 | a[: def foo(x: int, *y: bool, *, z: str | int | list[str]) -> Unknown] = foo
-          |                                           ^^^
-          |
-
-        info[inlay-hint-location]: Inlay Hint Target
-            --> stdlib/builtins.pyi:2802:7
-             |
-        2801 | @disjoint_base
-        2802 | class list(MutableSequence[_T]):
-             |       ^^^^
-        2803 |     """Built-in mutable sequence.
-             |
-        info: Source
-         --> main2.py:4:49
-          |
-        2 | def foo(x: int, *y: bool, z: str | int | list[str]): ...
-        3 |
-        4 | a[: def foo(x: int, *y: bool, *, z: str | int | list[str]) -> Unknown] = foo
-          |                                                 ^^^^
-          |
-
-        info[inlay-hint-location]: Inlay Hint Target
-           --> stdlib/builtins.pyi:915:7
-            |
-        914 | @disjoint_base
-        915 | class str(Sequence[str]):
-            |       ^^^
-        916 |     """str(object='') -> str
-        917 |     str(bytes_or_buffer[, encoding[, errors]]) -> str
-            |
-        info: Source
-         --> main2.py:4:54
-          |
-        2 | def foo(x: int, *y: bool, z: str | int | list[str]): ...
-        3 |
-        4 | a[: def foo(x: int, *y: bool, *, z: str | int | list[str]) -> Unknown] = foo
-          |                                                      ^^^
-          |
-
-        info[inlay-hint-location]: Inlay Hint Target
-          --> stdlib/ty_extensions.pyi:20:1
-           |
-        19 | # Types
-        20 | Unknown = object()
-           | ^^^^^^^
-        21 | AlwaysTruthy = object()
-        22 | AlwaysFalsy = object()
-           |
-        info: Source
-         --> main2.py:4:63
-          |
-        2 | def foo(x: int, *y: bool, z: str | int | list[str]): ...
-        3 |
-        4 | a[: def foo(x: int, *y: bool, *, z: str | int | list[str]) -> Unknown] = foo
-          |                                                               ^^^^^^^
-          |
-        "#);
-    }
-
-    #[test]
-    fn test_module_inlay_hint() {
-        let mut test = inlay_hint_test(
-            "
-                      import foo
-
-                      a = foo",
-        );
-
-        test.with_extra_file("foo.py", "'''Foo module'''");
-
-        assert_snapshot!(test.inlay_hints(), @r"
-        import foo
-
-        a[: <module 'foo'>] = foo
-        ---------------------------------------------
-        info[inlay-hint-location]: Inlay Hint Target
-         --> foo.py:1:1
-          |
-        1 | '''Foo module'''
-          | ^^^^^^^^^^^^^^^^
-          |
-        info: Source
-         --> main2.py:4:5
-          |
-        2 | import foo
-        3 |
-        4 | a[: <module 'foo'>] = foo
-          |     ^^^^^^^^^^^^^^
-          |
-        ");
-    }
-
-    #[test]
-    fn test_literal_type_alias_inlay_hint() {
-        let mut test = inlay_hint_test(
-            "
-                        from typing import Literal
-
-                        a = Literal['a', 'b', 'c']",
-        );
-
-        assert_snapshot!(test.inlay_hints(), @r"
-        from typing import Literal
-
-        a[: <typing.Literal special form>] = Literal['a', 'b', 'c']
-        ");
-    }
-
     struct InlayHintLocationDiagnostic {
         source: FileRange,
         target: FileRange,
@@ -6472,31 +5847,4 @@ mod tests {
             main
         }
     }
-
-    struct InlayHintEditDiagnostic {
-        file_content: String,
-    }
-
-    impl InlayHintEditDiagnostic {
-        fn new(file_content: String) -> Self {
-            Self { file_content }
-        }
-    }
-
-    impl IntoDiagnostic for InlayHintEditDiagnostic {
-        fn into_diagnostic(self) -> Diagnostic {
-            let mut main = Diagnostic::new(
-                DiagnosticId::Lint(LintName::of("inlay-hint-edit")),
-                Severity::Info,
-                "File after edits".to_string(),
-            );
-
-            main.sub(SubDiagnostic::new(
-                SubDiagnosticSeverity::Info,
-                format!("{}\n{}", "Source", self.file_content),
-            ));
-
-            main
-        }
-    }
 }

crates/ty_ide/src/lib.rs

@@ -3,16 +3,15 @@
     reason = "Prefer System trait methods over std methods in ty crates"
 )]
 mod all_symbols;
-mod code_action;
 mod completion;
 mod doc_highlights;
 mod docstring;
 mod document_symbols;
 mod find_node;
-mod find_references;
 mod goto;
 mod goto_declaration;
 mod goto_definition;
+mod goto_references;
 mod goto_type_definition;
 mod hover;
 mod importer;
@@ -28,16 +27,13 @@ mod symbols;
 mod workspace_symbols;
 
 pub use all_symbols::{AllSymbolInfo, all_symbols};
-pub use code_action::{QuickFix, code_actions};
 pub use completion::{Completion, CompletionKind, CompletionSettings, completion};
 pub use doc_highlights::document_highlights;
 pub use document_symbols::document_symbols;
-pub use find_references::find_references;
 pub use goto::{goto_declaration, goto_definition, goto_type_definition};
+pub use goto_references::goto_references;
 pub use hover::hover;
-pub use inlay_hints::{
-    InlayHintKind, InlayHintLabel, InlayHintSettings, InlayHintTextEdit, inlay_hints,
-};
+pub use inlay_hints::{InlayHintKind, InlayHintLabel, InlayHintSettings, inlay_hints};
 pub use markup::MarkupKind;
 pub use references::ReferencesMode;
 pub use rename::{can_rename, rename};

crates/ty_ide/src/references.rs

@@ -20,7 +20,7 @@ use ruff_python_ast::{
 };
 use ruff_python_parser::Tokens;
 use ruff_text_size::{Ranged, TextRange};
-use ty_python_semantic::{ImportAliasResolution, SemanticModel};
+use ty_python_semantic::ImportAliasResolution;
 
 /// Mode for references search behavior
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
@@ -48,9 +48,8 @@ pub(crate) fn references(
     // Get the definitions for the symbol at the cursor position
 
     // When finding references, do not resolve any local aliases.
-    let model = SemanticModel::new(db, file);
     let target_definitions_nav = goto_target
-        .get_definition_targets(&model, ImportAliasResolution::PreserveAliases)?
+        .get_definition_targets(file, db, ImportAliasResolution::PreserveAliases)?
         .definition_targets(db)?;
     let target_definitions: Vec<NavigationTarget> = target_definitions_nav.into_iter().collect();
 
@@ -122,10 +121,10 @@ fn references_for_file(
 ) {
     let parsed = ruff_db::parsed::parsed_module(db, file);
     let module = parsed.load(db);
-    let model = SemanticModel::new(db, file);
 
     let mut finder = LocalReferencesFinder {
-        model: &model,
+        db,
+        file,
         target_definitions,
         references,
         mode,
@@ -157,7 +156,8 @@ fn is_symbol_externally_visible(goto_target: &GotoTarget<'_>) -> bool {
 
 /// AST visitor to find all references to a specific symbol by comparing semantic definitions
 struct LocalReferencesFinder<'a> {
-    model: &'a SemanticModel<'a>,
+    db: &'a dyn Db,
+    file: File,
     tokens: &'a Tokens,
     target_definitions: &'a [NavigationTarget],
     references: &'a mut Vec<ReferenceTarget>,
@@ -219,11 +219,6 @@ impl<'a> SourceOrderVisitor<'a> for LocalReferencesFinder<'a> {
                     self.check_identifier_reference(name);
                 }
             }
-            AnyNodeRef::PatternMatchStar(pattern_star) if self.should_include_declaration() => {
-                if let Some(name) = &pattern_star.name {
-                    self.check_identifier_reference(name);
-                }
-            }
             AnyNodeRef::PatternMatchMapping(pattern_mapping)
                 if self.should_include_declaration() =>
             {
@@ -231,31 +226,6 @@ impl<'a> SourceOrderVisitor<'a> for LocalReferencesFinder<'a> {
                     self.check_identifier_reference(rest_name);
                 }
             }
-            AnyNodeRef::TypeParamParamSpec(param_spec) if self.should_include_declaration() => {
-                self.check_identifier_reference(&param_spec.name);
-            }
-            AnyNodeRef::TypeParamTypeVarTuple(param_tuple) if self.should_include_declaration() => {
-                self.check_identifier_reference(&param_tuple.name);
-            }
-            AnyNodeRef::TypeParamTypeVar(param_var) if self.should_include_declaration() => {
-                self.check_identifier_reference(&param_var.name);
-            }
-            AnyNodeRef::ExprStringLiteral(string_expr) if self.should_include_declaration() => {
-                // Highlight the sub-AST of a string annotation
-                if let Some((sub_ast, sub_model)) = self.model.enter_string_annotation(string_expr)
-                {
-                    let mut sub_finder = LocalReferencesFinder {
-                        model: &sub_model,
-                        target_definitions: self.target_definitions,
-                        references: self.references,
-                        mode: self.mode,
-                        tokens: sub_ast.tokens(),
-                        target_text: self.target_text,
-                        ancestors: Vec::new(),
-                    };
-                    sub_finder.visit_expr(sub_ast.expr());
-                }
-            }
             AnyNodeRef::Alias(alias) if self.should_include_declaration() => {
                 // Handle import alias declarations
                 if let Some(asname) = &alias.asname {
@@ -314,13 +284,14 @@ impl LocalReferencesFinder<'_> {
         // the node is fine here. Offsets matter only for import statements
         // where the identifier might be a multi-part module name.
         let offset = covering_node.node().start();
+
         if let Some(goto_target) =
-            GotoTarget::from_covering_node(self.model, covering_node, offset, self.tokens)
+            GotoTarget::from_covering_node(covering_node, offset, self.tokens)
         {
             // Get the definitions for this goto target
             if let Some(current_definitions_nav) = goto_target
-                .get_definition_targets(self.model, ImportAliasResolution::PreserveAliases)
-                .and_then(|definitions| definitions.declaration_targets(self.model.db()))
+                .get_definition_targets(self.file, self.db, ImportAliasResolution::PreserveAliases)
+                .and_then(|definitions| definitions.declaration_targets(self.db))
             {
                 let current_definitions: Vec<NavigationTarget> =
                     current_definitions_nav.into_iter().collect();
@@ -329,7 +300,7 @@ impl LocalReferencesFinder<'_> {
                     // Determine if this is a read or write reference
                     let kind = self.determine_reference_kind(covering_node);
                     let target =
-                        ReferenceTarget::new(self.model.file(), covering_node.node().range(), kind);
+                        ReferenceTarget::new(self.file, covering_node.node().range(), kind);
                     self.references.push(target);
                 }
             }

crates/ty_ide/src/rename.rs

@@ -3,16 +3,15 @@ use crate::references::{ReferencesMode, references};
 use crate::{Db, ReferenceTarget};
 use ruff_db::files::File;
 use ruff_text_size::{Ranged, TextSize};
-use ty_python_semantic::{ImportAliasResolution, SemanticModel};
+use ty_python_semantic::ImportAliasResolution;
 
 /// Returns the range of the symbol if it can be renamed, None if not.
 pub fn can_rename(db: &dyn Db, file: File, offset: TextSize) -> Option<ruff_text_size::TextRange> {
     let parsed = ruff_db::parsed::parsed_module(db, file);
     let module = parsed.load(db);
-    let model = SemanticModel::new(db, file);
 
     // Get the definitions for the symbol at the offset
-    let goto_target = find_goto_target(&model, &module, offset)?;
+    let goto_target = find_goto_target(&module, offset)?;
 
     // Don't allow renaming of import module components
     if matches!(
@@ -25,7 +24,7 @@ pub fn can_rename(db: &dyn Db, file: File, offset: TextSize) -> Option<ruff_text
     let current_file_in_project = is_file_in_project(db, file);
 
     if let Some(definition_targets) = goto_target
-        .get_definition_targets(&model, ImportAliasResolution::PreserveAliases)
+        .get_definition_targets(file, db, ImportAliasResolution::PreserveAliases)
         .and_then(|definitions| definitions.declaration_targets(db))
     {
         for target in &definition_targets {
@@ -59,10 +58,9 @@ pub fn rename(
 ) -> Option<Vec<ReferenceTarget>> {
     let parsed = ruff_db::parsed::parsed_module(db, file);
     let module = parsed.load(db);
-    let model = SemanticModel::new(db, file);
 
     // Get the definitions for the symbol at the offset
-    let goto_target = find_goto_target(&model, &module, offset)?;
+    let goto_target = find_goto_target(&module, offset)?;
 
     // Clients shouldn't call us with an empty new name, but just in case...
     if new_name.is_empty() {
@@ -339,546 +337,6 @@ class DataProcessor:
         ");
     }
 
-    #[test]
-    fn rename_string_annotation1() {
-        let test = cursor_test(
-            r#"
-        a: "MyCla<CURSOR>ss" = 1
-
-        class MyClass:
-            """some docs"""
-        "#,
-        );
-
-        assert_snapshot!(test.rename("MyNewClass"), @r#"
-        info[rename]: Rename symbol (found 2 locations)
-         --> main.py:2:5
-          |
-        2 | a: "MyClass" = 1
-          |     ^^^^^^^
-        3 |
-        4 | class MyClass:
-          |       -------
-        5 |     """some docs"""
-          |
-        "#);
-    }
-
-    #[test]
-    fn rename_string_annotation2() {
-        let test = cursor_test(
-            r#"
-        a: "None | MyCl<CURSOR>ass" = 1
-
-        class MyClass:
-            """some docs"""
-        "#,
-        );
-
-        assert_snapshot!(test.rename("MyNewClass"), @r#"
-        info[rename]: Rename symbol (found 2 locations)
-         --> main.py:2:12
-          |
-        2 | a: "None | MyClass" = 1
-          |            ^^^^^^^
-        3 |
-        4 | class MyClass:
-          |       -------
-        5 |     """some docs"""
-          |
-        "#);
-    }
-
-    #[test]
-    fn rename_string_annotation3() {
-        let test = cursor_test(
-            r#"
-        a: "None |<CURSOR> MyClass" = 1
-
-        class MyClass:
-            """some docs"""
-        "#,
-        );
-
-        assert_snapshot!(test.rename("MyNewClass"), @"Cannot rename");
-    }
-
-    #[test]
-    fn rename_string_annotation4() {
-        let test = cursor_test(
-            r#"
-        a: "None | MyClass<CURSOR>" = 1
-
-        class MyClass:
-            """some docs"""
-        "#,
-        );
-
-        assert_snapshot!(test.rename("MyNewClass"), @r#"
-        info[rename]: Rename symbol (found 2 locations)
-         --> main.py:2:12
-          |
-        2 | a: "None | MyClass" = 1
-          |            ^^^^^^^
-        3 |
-        4 | class MyClass:
-          |       -------
-        5 |     """some docs"""
-          |
-        "#);
-    }
-
-    #[test]
-    fn rename_string_annotation5() {
-        let test = cursor_test(
-            r#"
-        a: "None | MyClass"<CURSOR> = 1
-
-        class MyClass:
-            """some docs"""
-        "#,
-        );
-
-        assert_snapshot!(test.rename("MyNewClass"), @"Cannot rename");
-    }
-
-    #[test]
-    fn rename_string_annotation_dangling1() {
-        let test = cursor_test(
-            r#"
-        a: "MyCl<CURSOR>ass |" = 1
-
-        class MyClass:
-            """some docs"""
-        "#,
-        );
-
-        assert_snapshot!(test.rename("MyNewClass"), @"Cannot rename");
-    }
-
-    #[test]
-    fn rename_string_annotation_dangling2() {
-        let test = cursor_test(
-            r#"
-        a: "MyCl<CURSOR>ass | No" = 1
-
-        class MyClass:
-            """some docs"""
-        "#,
-        );
-
-        assert_snapshot!(test.rename("MyNewClass"), @r#"
-        info[rename]: Rename symbol (found 2 locations)
-         --> main.py:2:5
-          |
-        2 | a: "MyClass | No" = 1
-          |     ^^^^^^^
-        3 |
-        4 | class MyClass:
-          |       -------
-        5 |     """some docs"""
-          |
-        "#);
-    }
-
-    #[test]
-    fn rename_string_annotation_dangling3() {
-        let test = cursor_test(
-            r#"
-        a: "MyClass | N<CURSOR>o" = 1
-
-        class MyClass:
-            """some docs"""
-        "#,
-        );
-
-        assert_snapshot!(test.rename("MyNewClass"), @"Cannot rename");
-    }
-
-    #[test]
-    fn rename_match_name_stmt() {
-        let test = cursor_test(
-            r#"
-            def my_func(command: str):
-                match command.split():
-                    case ["get", a<CURSOR>b]:
-                        x = ab
-            "#,
-        );
-
-        assert_snapshot!(test.rename("XY"), @r#"
-        info[rename]: Rename symbol (found 2 locations)
-         --> main.py:4:22
-          |
-        2 | def my_func(command: str):
-        3 |     match command.split():
-        4 |         case ["get", ab]:
-          |                      ^^
-        5 |             x = ab
-          |                 --
-          |
-        "#);
-    }
-
-    #[test]
-    fn rename_match_name_binding() {
-        let test = cursor_test(
-            r#"
-            def my_func(command: str):
-                match command.split():
-                    case ["get", ab]:
-                        x = a<CURSOR>b
-            "#,
-        );
-
-        assert_snapshot!(test.rename("XY"), @r#"
-        info[rename]: Rename symbol (found 2 locations)
-         --> main.py:4:22
-          |
-        2 | def my_func(command: str):
-        3 |     match command.split():
-        4 |         case ["get", ab]:
-          |                      ^^
-        5 |             x = ab
-          |                 --
-          |
-        "#);
-    }
-
-    #[test]
-    fn rename_match_rest_stmt() {
-        let test = cursor_test(
-            r#"
-            def my_func(command: str):
-                match command.split():
-                    case ["get", *a<CURSOR>b]:
-                        x = ab
-            "#,
-        );
-
-        assert_snapshot!(test.rename("XY"), @r#"
-        info[rename]: Rename symbol (found 2 locations)
-         --> main.py:4:23
-          |
-        2 | def my_func(command: str):
-        3 |     match command.split():
-        4 |         case ["get", *ab]:
-          |                       ^^
-        5 |             x = ab
-          |                 --
-          |
-        "#);
-    }
-
-    #[test]
-    fn rename_match_rest_binding() {
-        let test = cursor_test(
-            r#"
-            def my_func(command: str):
-                match command.split():
-                    case ["get", *ab]:
-                        x = a<CURSOR>b
-            "#,
-        );
-
-        assert_snapshot!(test.rename("XY"), @r#"
-        info[rename]: Rename symbol (found 2 locations)
-         --> main.py:4:23
-          |
-        2 | def my_func(command: str):
-        3 |     match command.split():
-        4 |         case ["get", *ab]:
-          |                       ^^
-        5 |             x = ab
-          |                 --
-          |
-        "#);
-    }
-
-    #[test]
-    fn rename_match_as_stmt() {
-        let test = cursor_test(
-            r#"
-            def my_func(command: str):
-                match command.split():
-                    case ["get", ("a" | "b") as a<CURSOR>b]:
-                        x = ab
-            "#,
-        );
-
-        assert_snapshot!(test.rename("XY"), @r#"
-        info[rename]: Rename symbol (found 2 locations)
-         --> main.py:4:37
-          |
-        2 | def my_func(command: str):
-        3 |     match command.split():
-        4 |         case ["get", ("a" | "b") as ab]:
-          |                                     ^^
-        5 |             x = ab
-          |                 --
-          |
-        "#);
-    }
-
-    #[test]
-    fn rename_match_as_binding() {
-        let test = cursor_test(
-            r#"
-            def my_func(command: str):
-                match command.split():
-                    case ["get", ("a" | "b") as ab]:
-                        x = a<CURSOR>b
-            "#,
-        );
-
-        assert_snapshot!(test.rename("XY"), @r#"
-        info[rename]: Rename symbol (found 2 locations)
-         --> main.py:4:37
-          |
-        2 | def my_func(command: str):
-        3 |     match command.split():
-        4 |         case ["get", ("a" | "b") as ab]:
-          |                                     ^^
-        5 |             x = ab
-          |                 --
-          |
-        "#);
-    }
-
-    #[test]
-    fn rename_match_keyword_stmt() {
-        let test = cursor_test(
-            r#"
-            class Click:
-                __match_args__ = ("position", "button")
-                def __init__(self, pos, btn):
-                    self.position: int = pos
-                    self.button: str = btn
-            
-            def my_func(event: Click):
-                match event:
-                    case Click(x, button=a<CURSOR>b):
-                        x = ab
-            "#,
-        );
-
-        assert_snapshot!(test.rename("XY"), @r"
-        info[rename]: Rename symbol (found 2 locations)
-          --> main.py:10:30
-           |
-         8 | def my_func(event: Click):
-         9 |     match event:
-        10 |         case Click(x, button=ab):
-           |                              ^^
-        11 |             x = ab
-           |                 --
-           |
-        ");
-    }
-
-    #[test]
-    fn rename_match_keyword_binding() {
-        let test = cursor_test(
-            r#"
-            class Click:
-                __match_args__ = ("position", "button")
-                def __init__(self, pos, btn):
-                    self.position: int = pos
-                    self.button: str = btn
-            
-            def my_func(event: Click):
-                match event:
-                    case Click(x, button=ab):
-                        x = a<CURSOR>b
-            "#,
-        );
-
-        assert_snapshot!(test.rename("XY"), @r"
-        info[rename]: Rename symbol (found 2 locations)
-          --> main.py:10:30
-           |
-         8 | def my_func(event: Click):
-         9 |     match event:
-        10 |         case Click(x, button=ab):
-           |                              ^^
-        11 |             x = ab
-           |                 --
-           |
-        ");
-    }
-
-    #[test]
-    fn rename_match_class_name() {
-        let test = cursor_test(
-            r#"
-            class Click:
-                __match_args__ = ("position", "button")
-                def __init__(self, pos, btn):
-                    self.position: int = pos
-                    self.button: str = btn
-            
-            def my_func(event: Click):
-                match event:
-                    case Cl<CURSOR>ick(x, button=ab):
-                        x = ab
-            "#,
-        );
-
-        assert_snapshot!(test.rename("XY"), @r#"
-        info[rename]: Rename symbol (found 3 locations)
-          --> main.py:2:7
-           |
-         2 | class Click:
-           |       ^^^^^
-         3 |     __match_args__ = ("position", "button")
-         4 |     def __init__(self, pos, btn):
-           |
-          ::: main.py:8:20
-           |
-         6 |         self.button: str = btn
-         7 |
-         8 | def my_func(event: Click):
-           |                    -----
-         9 |     match event:
-        10 |         case Click(x, button=ab):
-           |              -----
-        11 |             x = ab
-           |
-        "#);
-    }
-
-    #[test]
-    fn rename_match_class_field_name() {
-        let test = cursor_test(
-            r#"
-            class Click:
-                __match_args__ = ("position", "button")
-                def __init__(self, pos, btn):
-                    self.position: int = pos
-                    self.button: str = btn
-            
-            def my_func(event: Click):
-                match event:
-                    case Click(x, but<CURSOR>ton=ab):
-                        x = ab
-            "#,
-        );
-
-        assert_snapshot!(test.rename("XY"), @"Cannot rename");
-    }
-
-    #[test]
-    fn rename_typevar_name_stmt() {
-        let test = cursor_test(
-            r#"
-            type Alias1[A<CURSOR>B: int = bool] = tuple[AB, list[AB]]
-            "#,
-        );
-
-        assert_snapshot!(test.rename("XY"), @r"
-        info[rename]: Rename symbol (found 3 locations)
-         --> main.py:2:13
-          |
-        2 | type Alias1[AB: int = bool] = tuple[AB, list[AB]]
-          |             ^^                      --       --
-          |
-        ");
-    }
-
-    #[test]
-    fn rename_typevar_name_binding() {
-        let test = cursor_test(
-            r#"
-            type Alias1[AB: int = bool] = tuple[A<CURSOR>B, list[AB]]
-            "#,
-        );
-
-        assert_snapshot!(test.rename("XY"), @r"
-        info[rename]: Rename symbol (found 3 locations)
-         --> main.py:2:13
-          |
-        2 | type Alias1[AB: int = bool] = tuple[AB, list[AB]]
-          |             ^^                      --       --
-          |
-        ");
-    }
-
-    #[test]
-    fn rename_typevar_spec_stmt() {
-        let test = cursor_test(
-            r#"
-            from typing import Callable
-            type Alias2[**A<CURSOR>B = [int, str]] = Callable[AB, tuple[AB]]
-            "#,
-        );
-
-        assert_snapshot!(test.rename("XY"), @r"
-        info[rename]: Rename symbol (found 3 locations)
-         --> main.py:3:15
-          |
-        2 | from typing import Callable
-        3 | type Alias2[**AB = [int, str]] = Callable[AB, tuple[AB]]
-          |               ^^                          --        --
-          |
-        ");
-    }
-
-    #[test]
-    fn rename_typevar_spec_binding() {
-        let test = cursor_test(
-            r#"
-            from typing import Callable
-            type Alias2[**AB = [int, str]] = Callable[A<CURSOR>B, tuple[AB]]
-            "#,
-        );
-
-        assert_snapshot!(test.rename("XY"), @r"
-        info[rename]: Rename symbol (found 3 locations)
-         --> main.py:3:15
-          |
-        2 | from typing import Callable
-        3 | type Alias2[**AB = [int, str]] = Callable[AB, tuple[AB]]
-          |               ^^                          --        --
-          |
-        ");
-    }
-
-    #[test]
-    fn rename_typevar_tuple_stmt() {
-        let test = cursor_test(
-            r#"
-            type Alias3[*A<CURSOR>B = ()] = tuple[tuple[*AB], tuple[*AB]]
-            "#,
-        );
-
-        assert_snapshot!(test.rename("XY"), @r"
-        info[rename]: Rename symbol (found 3 locations)
-         --> main.py:2:14
-          |
-        2 | type Alias3[*AB = ()] = tuple[tuple[*AB], tuple[*AB]]
-          |              ^^                      --          --
-          |
-        ");
-    }
-
-    #[test]
-    fn rename_typevar_tuple_binding() {
-        let test = cursor_test(
-            r#"
-            type Alias3[*AB = ()] = tuple[tuple[*A<CURSOR>B], tuple[*AB]]
-            "#,
-        );
-
-        assert_snapshot!(test.rename("XY"), @r"
-        info[rename]: Rename symbol (found 3 locations)
-         --> main.py:2:14
-          |
-        2 | type Alias3[*AB = ()] = tuple[tuple[*AB], tuple[*AB]]
-          |              ^^                      --          --
-          |
-        ");
-    }
-
     #[test]
     fn test_cannot_rename_import_module_component() {
         // Test that we cannot rename parts of module names in import statements

crates/ty_ide/src/semantic_tokens.rs

@@ -187,9 +187,9 @@ impl Deref for SemanticTokens {
 /// Pass None to get tokens for the entire file.
 pub fn semantic_tokens(db: &dyn Db, file: File, range: Option<TextRange>) -> SemanticTokens {
     let parsed = parsed_module(db, file).load(db);
-    let model = SemanticModel::new(db, file);
+    let semantic_model = SemanticModel::new(db, file);
 
-    let mut visitor = SemanticTokenVisitor::new(&model, range);
+    let mut visitor = SemanticTokenVisitor::new(&semantic_model, file, range);
     visitor.visit_body(parsed.suite());
 
     SemanticTokens::new(visitor.tokens)
@@ -197,7 +197,8 @@ pub fn semantic_tokens(db: &dyn Db, file: File, range: Option<TextRange>) -> Sem
 
 /// AST visitor that collects semantic tokens.
 struct SemanticTokenVisitor<'db> {
-    model: &'db SemanticModel<'db>,
+    semantic_model: &'db SemanticModel<'db>,
+    file: File,
     tokens: Vec<SemanticToken>,
     in_class_scope: bool,
     in_type_annotation: bool,
@@ -206,9 +207,14 @@ struct SemanticTokenVisitor<'db> {
 }
 
 impl<'db> SemanticTokenVisitor<'db> {
-    fn new(model: &'db SemanticModel<'db>, range_filter: Option<TextRange>) -> Self {
+    fn new(
+        semantic_model: &'db SemanticModel<'db>,
+        file: File,
+        range_filter: Option<TextRange>,
+    ) -> Self {
         Self {
-            model,
+            semantic_model,
+            file,
             tokens: Vec::new(),
             in_class_scope: false,
             in_target_creating_definition: false,
@@ -259,7 +265,7 @@ impl<'db> SemanticTokenVisitor<'db> {
 
     fn classify_name(&self, name: &ast::ExprName) -> (SemanticTokenType, SemanticTokenModifier) {
         // First try to classify the token based on its definition kind.
-        let definition = definition_for_name(self.model, name);
+        let definition = definition_for_name(self.semantic_model.db(), self.file, name);
 
         if let Some(definition) = definition {
             let name_str = name.id.as_str();
@@ -269,7 +275,7 @@ impl<'db> SemanticTokenVisitor<'db> {
         }
 
         // Fall back to type-based classification.
-        let ty = name.inferred_type(self.model);
+        let ty = name.inferred_type(self.semantic_model);
         let name_str = name.id.as_str();
         self.classify_from_type_and_name_str(ty, name_str)
     }
@@ -280,7 +286,7 @@ impl<'db> SemanticTokenVisitor<'db> {
         name_str: &str,
     ) -> Option<(SemanticTokenType, SemanticTokenModifier)> {
         let mut modifiers = SemanticTokenModifier::empty();
-        let db = self.model.db();
+        let db = self.semantic_model.db();
         let model = SemanticModel::new(db, definition.file(db));
 
         match definition.kind(db) {
@@ -706,12 +712,12 @@ impl SourceOrderVisitor<'_> for SemanticTokenVisitor<'_> {
                 for alias in &import.names {
                     if let Some(asname) = &alias.asname {
                         // For aliased imports (from X import Y as Z), classify Z based on what Y is
-                        let ty = alias.inferred_type(self.model);
+                        let ty = alias.inferred_type(self.semantic_model);
                         let (token_type, modifiers) = self.classify_from_alias_type(ty, asname);
                         self.add_token(asname, token_type, modifiers);
                     } else {
                         // For direct imports (from X import Y), use semantic classification
-                        let ty = alias.inferred_type(self.model);
+                        let ty = alias.inferred_type(self.semantic_model);
                         let (token_type, modifiers) =
                             self.classify_from_alias_type(ty, &alias.name);
                         self.add_token(&alias.name, token_type, modifiers);
@@ -831,7 +837,7 @@ impl SourceOrderVisitor<'_> for SemanticTokenVisitor<'_> {
                 self.visit_expr(&attr.value);
 
                 // Then add token for the attribute name (e.g., 'path' in 'os.path')
-                let ty = expr.inferred_type(self.model);
+                let ty = expr.inferred_type(self.semantic_model);
                 let (token_type, modifiers) =
                     Self::classify_from_type_for_attribute(ty, &attr.attr);
                 self.add_token(&attr.attr, token_type, modifiers);
@@ -875,17 +881,6 @@ impl SourceOrderVisitor<'_> for SemanticTokenVisitor<'_> {
 
                 self.visit_expr(&named.value);
             }
-            ast::Expr::StringLiteral(string_expr) => {
-                // Highlight the sub-AST of a string annotation
-                if let Some((sub_ast, sub_model)) = self.model.enter_string_annotation(string_expr)
-                {
-                    let mut sub_visitor = SemanticTokenVisitor::new(&sub_model, None);
-                    sub_visitor.visit_expr(sub_ast.expr());
-                    self.tokens.extend(sub_visitor.tokens);
-                } else {
-                    walk_expr(self, expr);
-                }
-            }
             _ => {
                 // For all other expression types, let the default visitor handle them
                 walk_expr(self, expr);
@@ -1060,33 +1055,12 @@ impl SourceOrderVisitor<'_> for SemanticTokenVisitor<'_> {
                     );
                 }
             }
-            ast::Pattern::MatchStar(pattern_star) => {
-                // Just the one ident here
-                if let Some(rest_name) = &pattern_star.name {
-                    self.add_token(
-                        rest_name.range(),
-                        SemanticTokenType::Variable,
-                        SemanticTokenModifier::empty(),
-                    );
-                }
-            }
             _ => {
                 // For all other pattern types, use the default walker
                 ruff_python_ast::visitor::source_order::walk_pattern(self, pattern);
             }
         }
     }
-
-    fn visit_comprehension(&mut self, comp: &ast::Comprehension) {
-        self.in_target_creating_definition = true;
-        self.visit_expr(&comp.target);
-        self.in_target_creating_definition = false;
-
-        self.visit_expr(&comp.iter);
-        for if_clause in &comp.ifs {
-            self.visit_expr(if_clause);
-        }
-    }
 }
 
 #[cfg(test)]
@@ -1590,50 +1564,6 @@ from mymodule import CONSTANT, my_function, MyClass
         "#);
     }
 
-    #[test]
-    fn test_str_annotation() {
-        let test = SemanticTokenTest::new(
-            r#"
-x: int = 1
-y: "int" = 1
-z = "int"
-w1: "int | str" = "hello"
-w2: "int | sr" = "hello"
-w3: "int | " = "hello"
-w4: "float"
-w5: "float
-"#,
-        );
-
-        let tokens = test.highlight_file();
-
-        assert_snapshot!(test.to_snapshot(&tokens), @r#"
-        "x" @ 1..2: Variable [definition]
-        "int" @ 4..7: Class
-        "1" @ 10..11: Number
-        "y" @ 12..13: Variable [definition]
-        "int" @ 16..19: Class
-        "1" @ 23..24: Number
-        "z" @ 25..26: Variable [definition]
-        "\"int\"" @ 29..34: String
-        "w1" @ 35..37: Variable [definition]
-        "int" @ 40..43: Class
-        "str" @ 46..49: Class
-        "\"hello\"" @ 53..60: String
-        "w2" @ 61..63: Variable [definition]
-        "int" @ 66..69: Class
-        "sr" @ 72..74: Variable
-        "\"hello\"" @ 78..85: String
-        "w3" @ 86..88: Variable [definition]
-        "\"int | \"" @ 90..98: String
-        "\"hello\"" @ 101..108: String
-        "w4" @ 109..111: Variable [definition]
-        "float" @ 114..119: Class
-        "w5" @ 121..123: Variable [definition]
-        "float" @ 126..131: Class
-        "#);
-    }
-
     #[test]
     fn test_attribute_classification() {
         let test = SemanticTokenTest::new(
@@ -2495,7 +2425,6 @@ def process_data(data):
         "rest" @ 154..158: Variable
         "person" @ 181..187: Variable
         "first" @ 202..207: Variable
-        "remaining" @ 210..219: Variable
         "sequence" @ 224..232: Variable
         "print" @ 246..251: Function
         "First: " @ 254..261: String
@@ -2666,50 +2595,6 @@ with open("file.txt") as f:
         "#);
     }
 
-    #[test]
-    fn test_comprehensions() {
-        let test = SemanticTokenTest::new(
-            r#"
-list_comp = [x for x in range(10) if x % 2 == 0]
-set_comp = {x for x in range(10)}
-dict_comp = {k: v for k, v in zip(["a", "b"], [1, 2])}
-generator = (x for x in range(10))
-"#,
-        );
-
-        let tokens = test.highlight_file();
-        assert_snapshot!(test.to_snapshot(&tokens), @r#"
-        "list_comp" @ 1..10: Variable [definition]
-        "x" @ 14..15: Variable
-        "x" @ 20..21: Variable [definition]
-        "range" @ 25..30: Class
-        "10" @ 31..33: Number
-        "x" @ 38..39: Variable
-        "2" @ 42..43: Number
-        "0" @ 47..48: Number
-        "set_comp" @ 50..58: Variable [definition]
-        "x" @ 62..63: Variable
-        "x" @ 68..69: Variable [definition]
-        "range" @ 73..78: Class
-        "10" @ 79..81: Number
-        "dict_comp" @ 84..93: Variable [definition]
-        "k" @ 97..98: Variable
-        "v" @ 100..101: Variable
-        "k" @ 106..107: Variable [definition]
-        "v" @ 109..110: Variable [definition]
-        "zip" @ 114..117: Class
-        "\"a\"" @ 119..122: String
-        "\"b\"" @ 124..127: String
-        "1" @ 131..132: Number
-        "2" @ 134..135: Number
-        "generator" @ 139..148: Variable [definition]
-        "x" @ 152..153: Variable
-        "x" @ 158..159: Variable [definition]
-        "range" @ 163..168: Class
-        "10" @ 169..171: Number
-        "#);
-    }
-
     /// Regression test for <https://github.com/astral-sh/ty/issues/1406>
     #[test]
     fn test_invalid_kwargs() {

crates/ty_ide/src/signature_help.rs

@@ -7,7 +7,7 @@
 //! and overloads.
 
 use crate::docstring::Docstring;
-use crate::goto::Definitions;
+use crate::goto::DefinitionsOrTargets;
 use crate::{Db, find_node::covering_node};
 use ruff_db::files::File;
 use ruff_db::parsed::parsed_module;
@@ -74,7 +74,7 @@ pub fn signature_help(db: &dyn Db, file: File, offset: TextSize) -> Option<Signa
 
     // Get signature details from the semantic analyzer.
     let signature_details: Vec<CallSignatureDetails<'_>> =
-        call_signature_details(&model, call_expr);
+        call_signature_details(db, &model, call_expr);
 
     if signature_details.is_empty() {
         return None;
@@ -214,7 +214,8 @@ fn get_callable_documentation(
     db: &dyn crate::Db,
     definition: Option<Definition>,
 ) -> Option<Docstring> {
-    Definitions(vec![ResolvedDefinition::Definition(definition?)]).docstring(db)
+    DefinitionsOrTargets::Definitions(vec![ResolvedDefinition::Definition(definition?)])
+        .docstring(db)
 }
 
 /// Create `ParameterDetails` objects from parameter label offsets.

crates/ty_ide/src/stub_mapping.rs

@@ -11,12 +11,12 @@ use crate::cached_vendored_root;
 /// other language server providers (like hover, completion, and signature help) to find
 /// docstrings for functions that resolve to stubs.
 pub(crate) struct StubMapper<'db> {
-    db: &'db dyn ty_python_semantic::Db,
+    db: &'db dyn crate::Db,
     cached_vendored_root: Option<SystemPathBuf>,
 }
 
 impl<'db> StubMapper<'db> {
-    pub(crate) fn new(db: &'db dyn ty_python_semantic::Db) -> Self {
+    pub(crate) fn new(db: &'db dyn crate::Db) -> Self {
         let cached_vendored_root = cached_vendored_root(db);
         Self {
             db,

crates/ty_ide/src/symbols.rs

@@ -23,12 +23,11 @@ use crate::completion::CompletionKind;
 pub struct QueryPattern {
     re: Option<Regex>,
     original: String,
-    original_is_exact: bool,
 }
 
 impl QueryPattern {
     /// Create a new query pattern from a literal search string given.
-    pub fn fuzzy(literal_query_string: &str) -> QueryPattern {
+    pub fn new(literal_query_string: &str) -> QueryPattern {
         let mut pattern = "(?i)".to_string();
         for ch in literal_query_string.chars() {
             pattern.push_str(&regex::escape(ch.encode_utf8(&mut [0; 4])));
@@ -42,16 +41,6 @@ impl QueryPattern {
         QueryPattern {
             re: Regex::new(&pattern).ok(),
             original: literal_query_string.to_string(),
-            original_is_exact: false,
-        }
-    }
-
-    /// Create a new query
-    pub fn exactly(symbol: &str) -> QueryPattern {
-        QueryPattern {
-            re: None,
-            original: symbol.to_string(),
-            original_is_exact: true,
         }
     }
 
@@ -60,7 +49,6 @@ impl QueryPattern {
         QueryPattern {
             re: None,
             original: String::new(),
-            original_is_exact: false,
         }
     }
 
@@ -71,8 +59,6 @@ impl QueryPattern {
     pub fn is_match_symbol_name(&self, symbol_name: &str) -> bool {
         if let Some(ref re) = self.re {
             re.is_match(symbol_name)
-        } else if self.original_is_exact {
-            symbol_name == self.original
         } else {
             // This is a degenerate case. The only way
             // we should get here is if the query string
@@ -89,13 +75,13 @@ impl QueryPattern {
     /// incorrectly. That is, it's possible that this query will match all
     /// inputs but this still returns `false`.
     pub fn will_match_everything(&self) -> bool {
-        self.re.is_none() && self.original.is_empty()
+        self.re.is_none()
     }
 }
 
 impl From<&str> for QueryPattern {
     fn from(literal_query_string: &str) -> QueryPattern {
-        QueryPattern::fuzzy(literal_query_string)
+        QueryPattern::new(literal_query_string)
     }
 }
 
@@ -579,7 +565,7 @@ impl SourceOrderVisitor<'_> for SymbolVisitor {
 #[cfg(test)]
 mod tests {
     fn matches(query: &str, symbol: &str) -> bool {
-        super::QueryPattern::fuzzy(query).is_match_symbol_name(symbol)
+        super::QueryPattern::new(query).is_match_symbol_name(symbol)
     }
 
     #[test]

crates/ty_ide/src/workspace_symbols.rs

@@ -12,7 +12,7 @@ pub fn workspace_symbols(db: &dyn Db, query: &str) -> Vec<WorkspaceSymbolInfo> {
 
     let project = db.project();
 
-    let query = QueryPattern::fuzzy(query);
+    let query = QueryPattern::new(query);
     let files = project.files(db);
     let results = std::sync::Mutex::new(Vec::new());
     {

crates/ty_python_semantic/Cargo.toml

@@ -13,7 +13,6 @@ license = { workspace = true }
 [dependencies]
 ruff_db = { workspace = true }
 ruff_annotate_snippets = { workspace = true }
-ruff_diagnostics = { workspace = true }
 ruff_index = { workspace = true, features = ["salsa"] }
 ruff_macros = { workspace = true }
 ruff_memory_usage = { workspace = true }

crates/ty_python_semantic/resources/corpus/classliteral_decorators_cycle.py

@@ -1,26 +0,0 @@
-try:
-    type name_4 = name_1
-finally:
-    from .. import name_3
-
-try:
-    pass
-except* 0:
-    pass
-else:
-    def name_1() -> name_4:
-        pass
-
-    @name_1
-    def name_3():
-        pass
-finally:
-    try:
-        pass
-    except* 0:
-        assert name_3
-    finally:
-
-        @name_3
-        class name_1:
-            pass

crates/ty_python_semantic/resources/corpus/cyclic_reassignment.py

@@ -1,5 +0,0 @@
-class foo[_: foo](object): ...
-
-[_] = (foo,) = foo
-
-def foo(): ...

crates/ty_python_semantic/resources/corpus/cyclic_type_alias.py

@@ -1,20 +0,0 @@
-name_3: Foo = 0
-name_4 = 0
-
-if _0:
-    type name_3 = name_5
-    type name_4 = name_3
-
-_1: name_3
-
-def name_1(_2: name_4):
-    pass
-
-match 0:
-    case name_1._3:
-        pass
-    case 1:
-        type name_5 = name_4
-    case name_5:
-        pass
-name_3 = name_5

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

@@ -35,8 +35,6 @@ bad_nesting: Literal[LiteralString]  # error: [invalid-type-form]
 
 `LiteralString` cannot be parameterized.
 
-<!-- snapshot-diagnostics -->
-
 ```py
 from typing_extensions import LiteralString
 
@@ -44,6 +42,7 @@ from typing_extensions import LiteralString
 a: LiteralString[str]
 
 # error: [invalid-type-form]
+# error: [unresolved-reference] "Name `foo` used when not defined"
 b: LiteralString["foo"]
 ```
 

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

@@ -260,13 +260,15 @@ class Shape:
 
     @classmethod
     def bar(cls: type[Self]) -> Self:
-        reveal_type(cls)  # revealed: type[Self@bar]
+        # TODO: type[Shape]
+        reveal_type(cls)  # revealed: @Todo(unsupported type[X] special form)
         return cls()
 
 class Circle(Shape): ...
 
 reveal_type(Shape().foo())  # revealed: Shape
-reveal_type(Shape.bar())  # revealed: Shape
+# TODO: Shape
+reveal_type(Shape.bar())  # revealed: Unknown
 ```
 
 ## Attributes

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

@@ -222,10 +222,10 @@ reveal_type(r)  # revealed: dict[int | str, int | str]
 ## Incorrect collection literal assignments are complained about
 
 ```py
-# error: [invalid-assignment] "Object of type `list[str | int]` is not assignable to `list[str]`"
+# error: [invalid-assignment] "Object of type `list[Unknown | int]` is not assignable to `list[str]`"
 a: list[str] = [1, 2, 3]
 
-# error: [invalid-assignment] "Object of type `set[int | str]` is not assignable to `set[int]`"
+# error: [invalid-assignment] "Object of type `set[Unknown | int | str]` is not assignable to `set[int]`"
 b: set[int] = {1, 2, "3"}
 ```
 
@@ -422,7 +422,7 @@ reveal_type(d)  # revealed: list[int | tuple[int, int]]
 e: list[int] = f(True)
 reveal_type(e)  # revealed: list[int]
 
-# error: [invalid-assignment] "Object of type `list[int | str]` is not assignable to `list[int]`"
+# error: [invalid-assignment] "Object of type `list[str]` is not assignable to `list[int]`"
 g: list[int] = f("a")
 
 # error: [invalid-assignment] "Object of type `list[str]` is not assignable to `tuple[int]`"
@@ -459,12 +459,12 @@ reveal_type(b)  # revealed: TD
 
 # error: [missing-typed-dict-key] "Missing required key 'x' in TypedDict `TD` constructor"
 # error: [invalid-key] "Unknown key "y" for TypedDict `TD`"
-# error: [invalid-assignment] "Object of type `TD | dict[Unknown | str, Unknown | int]` is not assignable to `TD`"
+# error: [invalid-assignment] "Object of type `Unknown | dict[Unknown | str, Unknown | int]` is not assignable to `TD`"
 c: TD = f([{"y": 0}, {"x": 1}])
 
 # error: [missing-typed-dict-key] "Missing required key 'x' in TypedDict `TD` constructor"
 # error: [invalid-key] "Unknown key "y" for TypedDict `TD`"
-# error: [invalid-assignment] "Object of type `TD | None | dict[Unknown | str, Unknown | int]` is not assignable to `TD | None`"
+# error: [invalid-assignment] "Object of type `Unknown | dict[Unknown | str, Unknown | int]` is not assignable to `TD | None`"
 c: TD | None = f([{"y": 0}, {"x": 1}])
 ```
 
@@ -715,17 +715,3 @@ def _(a: int, b: str, c: int | str):
     x9: int | str | None = f(lst(c))
     reveal_type(x9)  # revealed: int | str | None
 ```
-
-## Forward annotation with unclosed string literal
-
-Regression test for [#1611](https://github.com/astral-sh/ty/issues/1611).
-
-<!-- blacken-docs:off -->
-
-```py
-# error: [invalid-syntax]
-# error: [invalid-syntax-in-forward-annotation]
-a:'
-```
-
-<!-- blacken-docs:on -->

crates/ty_python_semantic/resources/mdtest/async.md

@@ -61,7 +61,8 @@ async def main():
 
     result = await task
 
-    reveal_type(result)  # revealed: int
+    # TODO: this should be `int`
+    reveal_type(result)  # revealed: Unknown
 ```
 
 ### `asyncio.gather`
@@ -78,8 +79,9 @@ async def main():
         task("B"),
     )
 
-    reveal_type(a)  # revealed: int
-    reveal_type(b)  # revealed: int
+    # TODO: these should be `int`
+    reveal_type(a)  # revealed: Unknown
+    reveal_type(b)  # revealed: Unknown
 ```
 
 ## Under the hood

crates/ty_python_semantic/resources/mdtest/attributes.md

@@ -1904,7 +1904,6 @@ we only consider the attribute assignment to be valid if the assigned attribute
 from typing import Literal
 
 class Date:
-    # error: [invalid-method-override]
     def __setattr__(self, name: Literal["day", "month", "year"], value: int) -> None:
         pass
 
@@ -2383,34 +2382,6 @@ class B:
 
 reveal_type(B().x)  # revealed: Unknown | Literal[1]
 reveal_type(A().x)  # revealed: Unknown | Literal[1]
-
-class Base:
-    def flip(self) -> "Sub":
-        return Sub()
-
-class Sub(Base):
-    # error: [invalid-method-override]
-    def flip(self) -> "Base":
-        return Base()
-
-class C2:
-    def __init__(self, x: Sub):
-        self.x = x
-
-    def replace_with(self, other: "C2"):
-        self.x = other.x.flip()
-
-reveal_type(C2(Sub()).x)  # revealed: Unknown | Base
-
-class C3:
-    def __init__(self, x: Sub):
-        self.x = [x]
-
-    def replace_with(self, other: "C3"):
-        self.x = [self.x[0].flip()]
-
-# TODO: should be `Unknown | list[Unknown | Sub] | list[Unknown | Base]`
-reveal_type(C3(Sub()).x)  # revealed: Unknown | list[Unknown | Sub] | list[Divergent]
 ```
 
 And cycles between many attributes:
@@ -2460,30 +2431,6 @@ class ManyCycles:
         reveal_type(self.x5)  # revealed: Unknown | int
         reveal_type(self.x6)  # revealed: Unknown | int
         reveal_type(self.x7)  # revealed: Unknown | int
-
-class ManyCycles2:
-    def __init__(self: "ManyCycles2"):
-        self.x1 = [0]
-        self.x2 = [1]
-        self.x3 = [1]
-
-    def f1(self: "ManyCycles2"):
-        # TODO: should be Unknown | list[Unknown | int] | list[Divergent]
-        reveal_type(self.x3)  # revealed: Unknown | list[Unknown | int] | list[Divergent] | list[Divergent]
-
-        self.x1 = [self.x2] + [self.x3]
-        self.x2 = [self.x1] + [self.x3]
-        self.x3 = [self.x1] + [self.x2]
-
-    def f2(self: "ManyCycles2"):
-        self.x1 = self.x2 + self.x3
-        self.x2 = self.x1 + self.x3
-        self.x3 = self.x1 + self.x2
-
-    def f3(self: "ManyCycles2"):
-        self.x1 = self.x2 + self.x3
-        self.x2 = self.x1 + self.x3
-        self.x3 = self.x1 + self.x2
 ```
 
 This case additionally tests our union/intersection simplification logic:
@@ -2650,7 +2597,7 @@ reveal_type(C().x)  # revealed: int
 ```py
 import enum
 
-reveal_type(enum.Enum.__members__)  # revealed: MappingProxyType[str, Enum]
+reveal_type(enum.Enum.__members__)  # revealed: MappingProxyType[str, Unknown]
 
 class Answer(enum.Enum):
     NO = 0
@@ -2658,23 +2605,17 @@ class Answer(enum.Enum):
 
 reveal_type(Answer.NO)  # revealed: Literal[Answer.NO]
 reveal_type(Answer.NO.value)  # revealed: Literal[0]
-reveal_type(Answer.__members__)  # revealed: MappingProxyType[str, Answer]
+reveal_type(Answer.__members__)  # revealed: MappingProxyType[str, Unknown]
 ```
 
 ## Divergent inferred implicit instance attribute types
 
-If an implicit attribute is defined recursively and type inference diverges, the divergent part is
-filled in with the dynamic type `Divergent`. Types containing `Divergent` can be seen as "cheap"
-recursive types: they are not true recursive types based on recursive type theory, so no unfolding
-is performed when you use them.
-
 ```py
 class C:
     def f(self, other: "C"):
         self.x = (other.x, 1)
 
 reveal_type(C().x)  # revealed: Unknown | tuple[Divergent, Literal[1]]
-reveal_type(C().x[0])  # revealed: Unknown | Divergent
 ```
 
 This also works if the tuple is not constructed directly:
@@ -2713,11 +2654,11 @@ And it also works for homogeneous tuples:
 def make_homogeneous_tuple(x: T) -> tuple[T, ...]:
     return (x, x)
 
-class F:
-    def f(self, other: "F"):
+class E:
+    def f(self, other: "E"):
         self.x = make_homogeneous_tuple(other.x)
 
-reveal_type(F().x)  # revealed: Unknown | tuple[Divergent, ...]
+reveal_type(E().x)  # revealed: Unknown | tuple[Divergent, ...]
 ```
 
 ## Attributes of standard library modules that aren't yet defined
@@ -2769,9 +2710,9 @@ We give special diagnostics for this common case too:
 import foo
 import baz
 
-# error: [possibly-missing-attribute]
+# error: [unresolved-attribute]
 reveal_type(foo.bar)  # revealed: Unknown
-# error: [possibly-missing-attribute]
+# error: [unresolved-attribute]
 reveal_type(baz.bar)  # revealed: Unknown
 ```
 

crates/ty_python_semantic/resources/mdtest/bidirectional.md

@@ -268,8 +268,8 @@ class A:
 
 A(f(1))
 
-# error: [invalid-argument-type] "Argument to function `__new__` is incorrect: Expected `list[int | str]`, found `list[int | None | list[Unknown]] & list[int | str | list[Unknown]] & list[list[Unknown]]`"
-# error: [invalid-argument-type] "Argument to bound method `__init__` is incorrect: Expected `list[int | None]`, found `list[int | None | list[Unknown]] & list[int | str | list[Unknown]] & list[list[Unknown]]`"
+# error: [invalid-argument-type] "Argument to function `__new__` is incorrect: Expected `list[int | str]`, found `list[list[Unknown]]`"
+# error: [invalid-argument-type] "Argument to bound method `__init__` is incorrect: Expected `list[int | None]`, found `list[list[Unknown]]`"
 A(f([]))
 ```
 

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

@@ -57,7 +57,7 @@ type("Foo", Base, {})
 # error: [invalid-argument-type] "Argument to class `type` is incorrect: Expected `tuple[type, ...]`, found `tuple[Literal[1], Literal[2]]`"
 type("Foo", (1, 2), {})
 
-# error: [invalid-argument-type] "Argument to class `type` is incorrect: Expected `dict[str, Any]`, found `dict[str | bytes, Any]`"
+# error: [invalid-argument-type] "Argument to class `type` is incorrect: Expected `dict[str, Any]`, found `dict[Unknown | bytes, Unknown | int]`"
 type("Foo", (Base,), {b"attr": 1})
 ```
 

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

@@ -237,26 +237,4 @@ class Matrix:
 Matrix() < Matrix()
 ```
 
-## `self`-binding behaviour of function-like `Callable`s
-
-Binding the `self` parameter of a function-like `Callable` creates a new `Callable` that is also
-function-like:
-
-`main.py`:
-
-```py
-from typing import Callable
-
-def my_lossy_decorator(fn: Callable[..., int]) -> Callable[..., int]:
-    return fn
-
-class MyClass:
-    @my_lossy_decorator
-    def method(self) -> int:
-        return 42
-
-reveal_type(MyClass().method)  # revealed: (...) -> int
-reveal_type(MyClass().method.__name__)  # revealed: str
-```
-
 [`tensorbase`]: https://github.com/pytorch/pytorch/blob/f3913ea641d871f04fa2b6588a77f63efeeb9f10/torch/_tensor.py#L1084-L1092

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

@@ -277,6 +277,6 @@ def _(flag: bool):
     x = f({"x": 1})
     reveal_type(x)  # revealed: int
 
-    # error: [invalid-argument-type] "Argument to function `f` is incorrect: Expected `T`, found `dict[str, int] & dict[Unknown | str, Unknown | int]`"
+    # error: [invalid-argument-type] "Argument to function `f` is incorrect: Expected `T`, found `dict[Unknown | str, Unknown | int]`"
     f({"y": 1})
 ```