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

2025-11-22 15:32:06 +00:00
63 changed files with 388 additions and 3054 deletions
--- a/.github/workflows/ci.yaml
+++ b/.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)
@@ -319,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"
@@ -352,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"
@@ -462,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
@@ -497,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
@@ -532,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
@@ -638,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' }}
@@ -697,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' }}
@@ -748,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' }}
@@ -792,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
@@ -947,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

@@ -987,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

@@ -1027,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

--- a/.github/workflows/daily_fuzz.yaml
+++ b/.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"
--- a/.github/workflows/mypy_primer.yaml
+++ b/.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:
--- a/.github/workflows/publish-pypi.yml
+++ b/.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-*
--- a/.github/workflows/release.yml
+++ b/.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
--- a/.github/workflows/sync_typeshed.yaml
+++ b/.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
--- a/.github/workflows/ty-ecosystem-analyzer.yaml
+++ b/.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

--- a/.github/workflows/ty-ecosystem-report.yaml
+++ b/.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

--- a/Cargo.lock
+++ b/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]]
@@ -3127,7 +3127,7 @@ dependencies = [
 "fern",
 "glob",
 "globset",
- "hashbrown 0.16.1",
+ "hashbrown 0.16.0",
 "imperative",
 "insta",
 "is-macro",
@@ -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",
@@ -5020,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]]
--- a/crates/ruff_benchmark/Cargo.toml
+++ b/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 }
--- a/crates/ruff_python_ast/src/nodes.rs
+++ b/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 {
--- a/crates/ruff_python_parser/resources/inline/err/ipython_help_escape_command_error_recovery_1.py
+++ b/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)
-?
--- a/crates/ruff_python_parser/resources/inline/err/ipython_help_escape_command_error_recovery_2.py
+++ 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
-?
--- a/crates/ruff_python_parser/resources/inline/err/ipython_help_escape_command_error_recovery_3.py
+++ 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
--- a/crates/ruff_python_parser/src/parser/mod.rs
+++ b/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),
            },
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@ipython_help_escape_command_error_recovery_1.py.snap
+++ b/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
-  |
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@ipython_help_escape_command_error_recovery_2.py.snap
+++ b/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
-  |
--- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@ipython_help_escape_command_error_recovery_3.py.snap
+++ b/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
-  |
--- a/crates/ty/docs/rules.md
+++ b/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#L126" 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#L170" 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#L196" 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#L221" 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#L247" 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>


@@ -190,7 +190,7 @@ class B(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%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#L312" 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>


@@ -217,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#L333" 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>


@@ -329,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#L537" 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>


@@ -359,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#L561" 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>


@@ -385,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#L365" 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>


@@ -474,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#L615" 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>


@@ -501,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#L655" 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>


@@ -529,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#L1814" 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>


@@ -563,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#L677" 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>


@@ -599,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#L707" 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>


@@ -623,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#L758" 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>


@@ -650,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#L779" 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>


@@ -679,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#L802" 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>


@@ -723,7 +723,7 @@ except ZeroDivisionError:
 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#L838" 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>


@@ -756,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#L582" 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>


@@ -795,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#L864" 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>


@@ -830,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#L961" 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>


@@ -858,99 +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#L1942" 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.
-
-[Liskov Substitution Principle]: https://en.wikipedia.org/wiki/Liskov_substitution_principle
-
 ## `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#L511" 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>


@@ -982,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#L937" 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>


@@ -1012,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#L988" 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>


@@ -1062,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#L1087" 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>


@@ -1088,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#L892" 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>


@@ -1119,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#L447" 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>


@@ -1153,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#L1107" 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>


@@ -1202,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#L636" 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>


@@ -1227,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#L1150" 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>


@@ -1285,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#L916" 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>


@@ -1312,7 +1226,7 @@ NewAlias = TypeAliasType(get_name(), int)        # error: TypeAliasType name mus
 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#L1189" 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>


@@ -1342,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#L1213" 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>


@@ -1372,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#L1265" 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>


@@ -1406,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#L1237" 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>


@@ -1440,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#L1293" 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>


@@ -1475,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#L1322" 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>


@@ -1500,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#L1915" 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>


@@ -1533,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#L1341" 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>


@@ -1562,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#L1364" 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>


@@ -1586,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#L1382" 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>


@@ -1612,7 +1526,7 @@ for i in 34:  # TypeError: 'int' object is not iterable
 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#L1433" 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>


@@ -1639,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#L1668" 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>


@@ -1697,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#L1790" 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>


@@ -1727,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#L1524" 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>


@@ -1756,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#L1569" 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>


@@ -1783,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#L1547" 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>


@@ -1811,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#L1590" 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>


@@ -1857,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#L1647" 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>


@@ -1884,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#L1689" 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>


@@ -1912,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#L1711" 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>


@@ -1937,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#L1730" 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>


@@ -1962,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#L1402" 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>


@@ -1999,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#L1749" 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>


@@ -2027,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#L1771" 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>


@@ -2052,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#L476" 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>


@@ -2093,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#L291" 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>


@@ -2181,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#L1454" 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>


@@ -2209,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#L144" 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>


@@ -2241,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#L1476" 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>


@@ -2273,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#L1842" 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>


@@ -2300,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#L1629" 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>


@@ -2324,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#L1863" 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>


@@ -2382,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#L725" 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>


@@ -2421,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#L1031" 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>


@@ -2484,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#L273" 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>


@@ -2508,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#L1502" 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>


--- a/crates/ty_ide/src/goto.rs
+++ b/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,
    },
@@ -303,21 +302,12 @@ 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)?
-            }
            // TODO: Support identifier targets
            GotoTarget::PatternMatchRest(_)
            | GotoTarget::PatternKeywordArgument(_)
            | GotoTarget::PatternMatchStarName(_)
            | GotoTarget::PatternMatchAsName(_)
+            | GotoTarget::ImportModuleComponent { .. }
            | GotoTarget::TypeParamParamSpecName(_)
            | GotoTarget::TypeParamTypeVarTupleName(_)
            | GotoTarget::NonLocal { .. }
@@ -363,30 +353,37 @@ 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<DefinitionsOrTargets<'db>> {
        use crate::NavigationTarget;
-        let db = model.db();
-        let file = model.file();

        match self {
-            GotoTarget::Expression(expression) => {
-                definitions_for_expression(model, expression).map(DefinitionsOrTargets::Definitions)
-            }
+            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(DefinitionsOrTargets::Definitions(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(DefinitionsOrTargets::Definitions(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(DefinitionsOrTargets::Definitions(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 {
@@ -407,18 +404,24 @@ impl GotoTarget<'_> {
            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 {
                    let alias_range = alias.asname.as_ref().unwrap().range;
                    Some(DefinitionsOrTargets::Targets(
@@ -441,8 +444,9 @@ impl GotoTarget<'_> {

            // For exception variables, they are their own definitions (like parameters)
            GotoTarget::ExceptVariable(except_handler) => {
+                let model = SemanticModel::new(db, file);
                Some(DefinitionsOrTargets::Definitions(vec![
-                    ResolvedDefinition::Definition(except_handler.definition(model)),
+                    ResolvedDefinition::Definition(except_handler.definition(&model)),
                ]))
            }

@@ -474,9 +478,9 @@ impl GotoTarget<'_> {
            //
            // 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() {
@@ -487,15 +491,18 @@ impl GotoTarget<'_> {
            }

            GotoTarget::BinOp { expression, .. } => {
+                let model = SemanticModel::new(db, file);
+
                let (definitions, _) =
-                    ty_python_semantic::definitions_for_bin_op(db, model, expression)?;
+                    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(db, model, expression)?;
+                    ty_python_semantic::definitions_for_unary_op(db, &model, expression)?;

                Some(DefinitionsOrTargets::Definitions(definitions))
            }
@@ -625,7 +632,6 @@ impl GotoTarget<'_> {
                                {
                                    return Some(GotoTarget::ImportModuleComponent {
                                        module_name: full_name.to_string(),
-                                        level: 0,
                                        component_index,
                                        component_range,
                                    });
@@ -666,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,
                            });
@@ -868,26 +876,27 @@ fn convert_resolved_definitions_to_targets(

 /// Shared helper to get definitions for an expr (that is presumably a name/attr)
 fn definitions_for_expression<'db>(
-    model: &SemanticModel<'db>,
+    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.db(), model.file(), name)),
+        ast::ExprRef::Name(name) => Some(definitions_for_name(db, file, name)),
        ast::ExprRef::Attribute(attribute) => Some(ty_python_semantic::definitions_for_attribute(
-            model.db(),
-            model.file(),
-            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.db(), model, call);
+    let signature_info = call_signature_details(db, &model, call);
    signature_info
        .into_iter()
        .filter_map(|signature| signature.definition.map(ResolvedDefinition::Definition))
@@ -938,9 +947,7 @@ pub(crate) fn find_goto_target(
    }

    let covering_node = covering_node(parsed.syntax().into(), token.range())
-        .find_first(|node| {
-            node.is_identifier() || node.is_expression() || node.is_stmt_import_from()
-        })
+        .find_first(|node| node.is_identifier() || node.is_expression())
        .ok()?;

    GotoTarget::from_covering_node(&covering_node, offset, parsed.tokens())
@@ -948,15 +955,21 @@ pub(crate) fn find_goto_target(

 /// Helper function to resolve a module name and create a navigation target.
 fn definitions_for_module<'db>(
-    model: &SemanticModel,
-    module: Option<&str>,
-    level: u32,
+    db: &'db dyn crate::Db,
+    module_name_str: &str,
 ) -> Option<DefinitionsOrTargets<'db>> {
-    let module = model.resolve_module(module, level)?;
-    let file = module.file(model.db())?;
-    Some(DefinitionsOrTargets::Definitions(vec![
-        ResolvedDefinition::Module(file),
-    ]))
+    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
@@ -970,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();

@@ -989,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]
-}
--- a/crates/ty_ide/src/goto_declaration.rs
+++ b/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.
 ///
@@ -18,9 +18,8 @@ pub fn goto_declaration(
    let module = parsed_module(db, file).load(db);
    let goto_target = find_goto_target(&module, offset)?;

-    let model = SemanticModel::new(db, file);
    let declaration_targets = goto_target
-        .get_definition_targets(&model, ImportAliasResolution::ResolveAliases)?
+        .get_definition_targets(file, db, ImportAliasResolution::ResolveAliases)?
        .declaration_targets(db)?;

    Some(RangedValue {
--- a/crates/ty_ide/src/goto_definition.rs
+++ b/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.
 ///
@@ -18,9 +18,9 @@ pub fn goto_definition(
 ) -> Option<RangedValue<NavigationTargets>> {
    let module = parsed_module(db, file).load(db);
    let goto_target = find_goto_target(&module, offset)?;
-    let model = SemanticModel::new(db, file);
+
    let definition_targets = goto_target
-        .get_definition_targets(&model, ImportAliasResolution::ResolveAliases)?
+        .get_definition_targets(file, db, ImportAliasResolution::ResolveAliases)?
        .definition_targets(db)?;

    Some(RangedValue {
--- a/crates/ty_ide/src/goto_type_definition.rs
+++ b/crates/ty_ide/src/goto_type_definition.rs
@@ -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(
--- a/crates/ty_ide/src/hover.rs
+++ b/crates/ty_ide/src/hover.rs
@@ -22,7 +22,8 @@ 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))
@@ -1487,17 +1488,11 @@ def ab(a: int, *, c: int):
        .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.
--- a/crates/ty_ide/src/references.rs
+++ b/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();

@@ -290,9 +289,8 @@ impl LocalReferencesFinder<'_> {
            GotoTarget::from_covering_node(covering_node, offset, self.tokens)
        {
            // Get the definitions for this goto target
-            let model = SemanticModel::new(self.db, self.file);
            if let Some(current_definitions_nav) = goto_target
-                .get_definition_targets(&model, ImportAliasResolution::PreserveAliases)
+                .get_definition_targets(self.file, self.db, ImportAliasResolution::PreserveAliases)
                .and_then(|definitions| definitions.declaration_targets(self.db))
            {
                let current_definitions: Vec<NavigationTarget> =
--- a/crates/ty_ide/src/rename.rs
+++ b/crates/ty_ide/src/rename.rs
@@ -3,13 +3,12 @@ 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(&module, offset)?;
@@ -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 {
--- a/crates/ty_python_semantic/resources/mdtest/assignment/annotations.md
+++ b/crates/ty_python_semantic/resources/mdtest/assignment/annotations.md
@@ -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 -->
--- a/crates/ty_python_semantic/resources/mdtest/attributes.md
+++ b/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

--- a/crates/ty_python_semantic/resources/mdtest/class/super.md
+++ b/crates/ty_python_semantic/resources/mdtest/class/super.md
@@ -501,8 +501,8 @@ class A[T]:
        return a

 class B[T](A[T]):
-    def f(self, a: T) -> T:
-        return super().f(a)
+    def f(self, b: T) -> T:
+        return super().f(b)
 ```

 ## Invalid Usages
--- a/crates/ty_python_semantic/resources/mdtest/comparison/instances/rich_comparison.md
+++ b/crates/ty_python_semantic/resources/mdtest/comparison/instances/rich_comparison.md
@@ -24,10 +24,10 @@ class GtReturnType: ...
 class GeReturnType: ...

 class A:
-    def __eq__(self, other: A) -> EqReturnType:  # error: [invalid-method-override]
+    def __eq__(self, other: A) -> EqReturnType:
        return EqReturnType()

-    def __ne__(self, other: A) -> NeReturnType:  # error: [invalid-method-override]
+    def __ne__(self, other: A) -> NeReturnType:
        return NeReturnType()

    def __lt__(self, other: A) -> LtReturnType:
@@ -66,10 +66,10 @@ class GtReturnType: ...
 class GeReturnType: ...

 class A:
-    def __eq__(self, other: B) -> EqReturnType:  # error: [invalid-method-override]
+    def __eq__(self, other: B) -> EqReturnType:
        return EqReturnType()

-    def __ne__(self, other: B) -> NeReturnType:  # error: [invalid-method-override]
+    def __ne__(self, other: B) -> NeReturnType:
        return NeReturnType()

    def __lt__(self, other: B) -> LtReturnType:
@@ -111,10 +111,10 @@ class GtReturnType: ...
 class GeReturnType: ...

 class A:
-    def __eq__(self, other: B) -> EqReturnType:  # error: [invalid-method-override]
+    def __eq__(self, other: B) -> EqReturnType:
        return EqReturnType()

-    def __ne__(self, other: B) -> NeReturnType:  # error: [invalid-method-override]
+    def __ne__(self, other: B) -> NeReturnType:
        return NeReturnType()

    def __lt__(self, other: B) -> LtReturnType:
@@ -132,10 +132,12 @@ class A:
 class Unrelated: ...

 class B:
-    def __eq__(self, other: Unrelated) -> B:  # error: [invalid-method-override]
+    # To override builtins.object.__eq__ and builtins.object.__ne__
+    # TODO these should emit an invalid override diagnostic
+    def __eq__(self, other: Unrelated) -> B:
        return B()

-    def __ne__(self, other: Unrelated) -> B:  # error: [invalid-method-override]
+    def __ne__(self, other: Unrelated) -> B:
        return B()

 # Because `object.__eq__` and `object.__ne__` accept `object` in typeshed,
@@ -178,10 +180,10 @@ class GtReturnType: ...
 class GeReturnType: ...

 class A:
-    def __eq__(self, other: A) -> A:  # error: [invalid-method-override]
+    def __eq__(self, other: A) -> A:
        return A()

-    def __ne__(self, other: A) -> A:  # error: [invalid-method-override]
+    def __ne__(self, other: A) -> A:
        return A()

    def __lt__(self, other: A) -> A:
@@ -197,22 +199,22 @@ class A:
        return A()

 class B(A):
-    def __eq__(self, other: A) -> EqReturnType:  # error: [invalid-method-override]
+    def __eq__(self, other: A) -> EqReturnType:
        return EqReturnType()

-    def __ne__(self, other: A) -> NeReturnType:  # error: [invalid-method-override]
+    def __ne__(self, other: A) -> NeReturnType:
        return NeReturnType()

-    def __lt__(self, other: A) -> LtReturnType:  # error: [invalid-method-override]
+    def __lt__(self, other: A) -> LtReturnType:
        return LtReturnType()

-    def __le__(self, other: A) -> LeReturnType:  # error: [invalid-method-override]
+    def __le__(self, other: A) -> LeReturnType:
        return LeReturnType()

-    def __gt__(self, other: A) -> GtReturnType:  # error: [invalid-method-override]
+    def __gt__(self, other: A) -> GtReturnType:
        return GtReturnType()

-    def __ge__(self, other: A) -> GeReturnType:  # error: [invalid-method-override]
+    def __ge__(self, other: A) -> GeReturnType:
        return GeReturnType()

 reveal_type(A() == B())  # revealed: EqReturnType
@@ -241,10 +243,10 @@ class A:
        return A()

 class B(A):
-    def __lt__(self, other: int) -> B:  # error: [invalid-method-override]
+    def __lt__(self, other: int) -> B:
        return B()

-    def __gt__(self, other: int) -> B:  # error: [invalid-method-override]
+    def __gt__(self, other: int) -> B:
        return B()

 reveal_type(A() < B())  # revealed: A
@@ -289,10 +291,11 @@ Please refer to the [docs](https://docs.python.org/3/reference/datamodel.html#ob
 from __future__ import annotations

 class A:
-    def __eq__(self, other: int) -> A:  # error: [invalid-method-override]
+    # TODO both these overrides should emit invalid-override diagnostic
+    def __eq__(self, other: int) -> A:
        return A()

-    def __ne__(self, other: int) -> A:  # error: [invalid-method-override]
+    def __ne__(self, other: int) -> A:
        return A()

 reveal_type(A() == A())  # revealed: bool
--- a/crates/ty_python_semantic/resources/mdtest/comparison/tuples.md
+++ b/crates/ty_python_semantic/resources/mdtest/comparison/tuples.md
@@ -155,10 +155,10 @@ class GtReturnType: ...
 class GeReturnType: ...

 class A:
-    def __eq__(self, o: object) -> EqReturnType:  # error: [invalid-method-override]
+    def __eq__(self, o: object) -> EqReturnType:
        return EqReturnType()

-    def __ne__(self, o: object) -> NeReturnType:  # error: [invalid-method-override]
+    def __ne__(self, o: object) -> NeReturnType:
        return NeReturnType()

    def __lt__(self, o: A) -> LtReturnType:
@@ -386,7 +386,6 @@ class NotBoolable:
    __bool__: None = None

 class A:
-    # error: [invalid-method-override]
    def __eq__(self, other) -> NotBoolable:
        return NotBoolable()

--- a/crates/ty_python_semantic/resources/mdtest/directives/assert_never.md
+++ b/crates/ty_python_semantic/resources/mdtest/directives/assert_never.md
@@ -124,6 +124,10 @@ def match_singletons_error(obj: Literal[1, "a"] | None):
        case None:
            pass
        case _ as obj:
-            # TODO: We should emit an error here: `Literal["a"]` is not `Never`.
+            # TODO: We should emit an error here, but the message should
+            # show the type `Literal["a"]` instead of `@Todo(…)`. We only
+            # assert on the first part of the message because the `@Todo`
+            # message is not available in release mode builds.
+            # error: [type-assertion-failure] "Type `@Todo"
            assert_never(obj)
 ```
--- a/crates/ty_python_semantic/resources/mdtest/expression/len.md
+++ b/crates/ty_python_semantic/resources/mdtest/expression/len.md
@@ -103,7 +103,8 @@ class UnknownLengthSubclassWithDunderLenOverridden(tuple[int, ...]):
 reveal_type(len(UnknownLengthSubclassWithDunderLenOverridden()))  # revealed: Literal[42]

 class FixedLengthSubclassWithDunderLenOverridden(tuple[int]):
-    def __len__(self) -> Literal[42]:  # error: [invalid-method-override]
+    # TODO: we should complain about this as a Liskov violation (incompatible override)
+    def __len__(self) -> Literal[42]:
        return 42

 reveal_type(len(FixedLengthSubclassWithDunderLenOverridden((1,))))  # revealed: Literal[42]
--- a/crates/ty_python_semantic/resources/mdtest/liskov.md
+++ b/crates/ty_python_semantic/resources/mdtest/liskov.md
@@ -1,525 +0,0 @@
-# The Liskov Substitution Principle
-
-The Liskov Substitution Principle provides the basis for many of the assumptions a type checker
-generally makes about types in Python:
-
-> Subtype Requirement: Let ⁠`ϕ(x)`⁠ be a property provable about objects ⁠`x`⁠ of type `T`. Then
-> ⁠`ϕ(y)`⁠ should be true for objects ⁠`y` of type `S` where `S` is a subtype of `T`.
-
-In order for a type checker's assumptions to be sound, it is crucial for the type checker to enforce
-the Liskov Substitution Principle on code that it checks. In practice, this usually manifests as
-several checks for a type checker to perform when it checks a subclass `B` of a class `A`:
-
-1. Read-only attributes should only ever be overridden covariantly: if a property `A.p` resolves to
-    `int` when accessed, accessing `B.p` should either resolve to `int` or a subtype of `int`.
-1. Method return types should only ever be overridden covariantly: if a method `A.f` returns `int`
-    when called, calling `B.f` should also resolve to `int or a subtype of`int\`.
-1. Method parameters should only ever be overridden contravariantly: if a method `A.f` can be called
-    with an argument of type `bool`, then the method `B.f` must also be callable with type `bool`
-    (though it is permitted for the override to also accept other types)
-1. Mutable attributes should only ever be overridden invariantly: if a mutable attribute `A.attr`
-    resolves to type `str`, it can only be overridden on a subclass with exactly the same type.
-
-## Method return types
-
-<!-- snapshot-diagnostics -->
-
-```pyi
-class Super:
-    def method(self) -> int: ...
-
-class Sub1(Super):
-    def method(self) -> int: ...  # fine
-
-class Sub2(Super):
-    def method(self) -> bool: ...  # fine: `bool` is a subtype of `int`
-
-class Sub3(Super):
-    def method(self) -> object: ...  # error: [invalid-method-override]
-
-class Sub4(Super):
-    def method(self) -> str: ...  # error: [invalid-method-override]
-```
-
-## Method parameters
-
-<!-- snapshot-diagnostics -->
-
-```pyi
-class Super:
-    def method(self, x: int, /): ...
-
-class Sub1(Super):
-    def method(self, x: int, /): ...  # fine
-
-class Sub2(Super):
-    def method(self, x: object, /): ...  # fine: `method` still accepts any argument of type `int`
-
-class Sub4(Super):
-    def method(self, x: int | str, /): ...  # fine
-
-class Sub5(Super):
-    def method(self, x: int): ...  # fine: `x` can still be passed positionally
-
-class Sub6(Super):
-    # fine: `method()` can still be called with just a single argument
-    def method(self, x: int, *args): ...
-
-class Sub7(Super):
-    def method(self, x: int, **kwargs): ...  # fine
-
-class Sub8(Super):
-    def method(self, x: int, *args, **kwargs): ...  # fine
-
-class Sub9(Super):
-    def method(self, x: int, extra_positional_arg=42, /): ... # fine
-
-class Sub10(Super):
-    def method(self, x: int, extra_pos_or_kw_arg=42): ...  # fine
-
-class Sub11(Super):
-    def method(self, x: int, *, extra_kw_only_arg=42): ...  # fine
-
-class Sub12(Super):
-    # Some calls permitted by the superclass are now no longer allowed
-    # (the method can no longer be passed any arguments!)
-    def method(self, /): ...  # error: [invalid-method-override]
-
-class Sub13(Super):
-    # Some calls permitted by the superclass are now no longer allowed
-    # (the method can no longer be passed exactly one argument!)
-    def method(self, x, y, /): ...  # error: [invalid-method-override]
-
-class Sub14(Super):
-    # Some calls permitted by the superclass are now no longer allowed
-    # (x can no longer be passed positionally!)
-    def method(self, /, *, x): ...  # error: [invalid-method-override]
-
-class Sub15(Super):
-    # Some calls permitted by the superclass are now no longer allowed
-    # (x can no longer be passed any integer -- it now requires a bool!)
-    def method(self, x: bool, /): ...  # error: [invalid-method-override]
-
-class Super2:
-    def method2(self, x): ...
-
-class Sub16(Super2):
-    def method2(self, x, /): ...  # error: [invalid-method-override]
-
-class Sub17(Super2):
-    def method2(self, *, x): ...  # error: [invalid-method-override]
-
-class Super3:
-    def method3(self, *, x): ...
-
-class Sub18(Super3):
-    def method3(self, x): ...  # fine: `x` can still be used as a keyword argument
-
-class Sub19(Super3):
-    def method3(self, x, /): ...  # error: [invalid-method-override]
-
-class Super4:
-    def method(self, *args: int, **kwargs: str): ...
-
-class Sub20(Super4):
-    def method(self, *args: object, **kwargs: object): ...  # fine
-
-class Sub21(Super4):
-    def method(self, *args): ...  # error: [invalid-method-override]
-
-class Sub22(Super4):
-    def method(self, **kwargs): ...  # error: [invalid-method-override]
-
-class Sub23(Super4):
-    def method(self, x, *args, y, **kwargs): ...  # error: [invalid-method-override]
-```
-
-## The entire class hierarchy is checked
-
-If a child class's method definition is Liskov-compatible with the method definition on its parent
-class, Liskov compatibility must also nonetheless be checked with respect to the method definition
-on its grandparent class. This is because type checkers will treat the child class as a subtype of
-the grandparent class just as much as they treat it as a subtype of the parent class, so
-substitutability with respect to the grandparent class is just as important:
-
-<!-- snapshot-diagnostics -->
-
-`stub.pyi`:
-
-```pyi
-from typing import Any
-
-class Grandparent:
-    def method(self, x: int) -> None: ...
-
-class Parent(Grandparent):
-    def method(self, x: str) -> None: ...  # error: [invalid-method-override]
-
-class Child(Parent):
-    # compatible with the signature of `Parent.method`, but not with `Grandparent.method`:
-    def method(self, x: str) -> None: ...  # error: [invalid-method-override]
-
-class OtherChild(Parent):
-    # compatible with the signature of `Grandparent.method`, but not with `Parent.method`:
-    def method(self, x: int) -> None: ...  # error: [invalid-method-override]
-
-class GradualParent(Grandparent):
-    def method(self, x: Any) -> None: ...
-
-class ThirdChild(GradualParent):
-    # `GradualParent.method` is compatible with the signature of `Grandparent.method`,
-    # and `ThirdChild.method` is compatible with the signature of `GradualParent.method`,
-    # but `ThirdChild.method` is not compatible with the signature of `Grandparent.method`
-    def method(self, x: str) -> None: ...  # error: [invalid-method-override]
-```
-
-`other_stub.pyi`:
-
-```pyi
-class A:
-    def get(self, default): ...
-
-class B(A):
-    def get(self, default, /): ...  # error: [invalid-method-override]
-
-get = 56
-
-class C(B):
-    # `get` appears in the symbol table of `C`,
-    # but that doesn't confuse our diagnostic...
-    foo = get
-
-class D(C):
-    # compatible with `C.get` and `B.get`, but not with `A.get`
-    def get(self, my_default): ...  # error: [invalid-method-override]
-```
-
-## Non-generic methods on generic classes work as expected
-
-```toml
-[environment]
-python-version = "3.12"
-```
-
-```pyi
-class A[T]:
-    def method(self, x: T) -> None: ...
-
-class B[T](A[T]):
-    def method(self, x: T) -> None: ...  # fine
-
-class C(A[int]):
-    def method(self, x: int) -> None: ...  # fine
-
-class D[T](A[T]):
-    def method(self, x: object) -> None: ...  # fine
-
-class E(A[int]):
-    def method(self, x: object) -> None: ...  # fine
-
-class F[T](A[T]):
-    # TODO: we should emit `invalid-method-override` on this:
-    # `str` is not necessarily a supertype of `T`!
-    def method(self, x: str) -> None: ...
-
-class G(A[int]):
-    def method(self, x: bool) -> None: ...  # error: [invalid-method-override]
-```
-
-## Generic methods on non-generic classes work as expected
-
-```toml
-[environment]
-python-version = "3.12"
-```
-
-```pyi
-from typing import Never, Self
-
-class A:
-    def method[T](self, x: T) -> T: ...
-
-class B(A):
-    def method[T](self, x: T) -> T: ...  # fine
-
-class C(A):
-    def method(self, x: object) -> Never: ...  # fine
-
-class D(A):
-    # TODO: we should emit [invalid-method-override] here:
-    # `A.method` accepts an argument of any type,
-    # but `D.method` only accepts `int`s
-    def method(self, x: int) -> int: ...
-
-class A2:
-    def method(self, x: int) -> int: ...
-
-class B2(A2):
-    # fine: although `B2.method()` will not always return an `int`,
-    # an instance of `B2` can be substituted wherever an instance of `A2` is expected,
-    # and it *will* always return an `int` if it is passed an `int`
-    # (which is all that will be allowed if an instance of `A2` is expected)
-    def method[T](self, x: T) -> T: ...
-
-class C2(A2):
-    def method[T: int](self, x: T) -> T: ...
-
-class D2(A2):
-    # The type variable is bound to a type disjoint from `int`,
-    # so the method will not accept integers, and therefore this is an invalid override
-    def method[T: str](self, x: T) -> T: ...  # error: [invalid-method-override]
-
-class A3:
-    def method(self) -> Self: ...
-
-class B3(A3):
-    def method(self) -> Self: ...  # fine
-
-class C3(A3):
-    # TODO: should this be allowed?
-    # Mypy/pyright/pyrefly all allow it,
-    # but conceptually it seems similar to `B4.method` below,
-    # which mypy/pyrefly agree is a Liskov violation
-    # (pyright disagrees as of 20/11/2025: https://github.com/microsoft/pyright/issues/11128)
-    # when called on a subclass, `C3.method()` will not return an
-    # instance of that subclass
-    def method(self) -> C3: ...
-
-class D3(A3):
-    def method(self: Self) -> Self: ...  # fine
-
-class E3(A3):
-    def method(self: E3) -> Self: ...  # fine
-
-class F3(A3):
-    def method(self: A3) -> Self: ...  # fine
-
-class G3(A3):
-    def method(self: object) -> Self: ...  # fine
-
-class H3(A3):
-    # TODO: we should emit `invalid-method-override` here
-    # (`A3.method()` can be called on any instance of `A3`,
-    # but `H3.method()` can only be called on objects that are
-    # instances of `str`)
-    def method(self: str) -> Self: ...
-
-class I3(A3):
-    # TODO: we should emit `invalid-method-override` here
-    # (`I3.method()` cannot be called with any inhabited type!)
-    def method(self: Never) -> Self: ...
-
-class A4:
-    def method[T: int](self, x: T) -> T: ...
-
-class B4(A4):
-    # TODO: we should emit `invalid-method-override` here.
-    # `A4.method` promises that if it is passed a `bool`, it will return a `bool`,
-    # but this is not necessarily true for `B4.method`: if passed a `bool`,
-    # it could return a non-`bool` `int`!
-    def method(self, x: int) -> int: ...
-```
-
-## Generic methods on generic classes work as expected
-
-```toml
-[environment]
-python-version = "3.12"
-```
-
-```pyi
-from typing import Never
-
-class A[T]:
-    def method[S](self, x: T, y: S) -> S: ...
-
-class B[T](A[T]):
-    def method[S](self, x: T, y: S) -> S: ...  # fine
-
-class C(A[int]):
-    def method[S](self, x: int, y: S) -> S: ...  # fine
-
-class D[T](A[T]):
-    def method[S](self, x: object, y: S) -> S: ...  # fine
-
-class E(A[int]):
-    def method[S](self, x: object, y: S) -> S: ...  # fine
-
-class F(A[int]):
-    def method(self, x: object, y: object) -> Never: ...  # fine
-
-class A2[T]:
-    def method(self, x: T, y: int) -> int: ...
-
-class B2[T](A2[T]):
-    def method[S](self, x: T, y: S) -> S: ...  # fine
-```
-
-## Fully qualified names are used in diagnostics where appropriate
-
-<!-- snapshot-diagnostics -->
-
-`a.pyi`:
-
-```pyi
-class A:
-    def foo(self, x): ...
-```
-
-`b.pyi`:
-
-```pyi
-import a
-
-class A(a.A):
-    def foo(self, y): ...  # error: [invalid-method-override]
-```
-
-## Excluded methods
-
-Certain special constructor methods are excluded from Liskov checks. None of the following classes
-cause us to emit any errors, therefore:
-
-```toml
-# This is so that the dataclasses machinery will generate `__replace__` methods for us
-# (the synthesized `__replace__` methods should not be reported as invalid overrides!)
-[environment]
-python-version = "3.13"
-```
-
-```pyi
-from dataclasses import dataclass
-from typing_extensions import Self
-
-class Grandparent: ...
-class Parent(Grandparent):
-    def __new__(cls, x: int) -> Self: ...
-    def __init__(self, x: int) -> None: ...
-
-class Child(Parent):
-    def __new__(cls, x: str, y: str) -> Self: ...
-    def __init__(self, x: str, y: str) -> Self: ...
-
-@dataclass(init=False)
-class DataSuper:
-    x: int
-
-    def __post_init__(self, x: int) -> None:
-        self.x = x
-
-@dataclass(init=False)
-class DataSub(DataSuper):
-    y: str
-
-    def __post_init__(self, x: int, y: str) -> None:
-        self.y = y
-        super().__post_init__(x)
-```
-
-## Edge case: function defined in another module and then assigned in a class body
-
-<!-- snapshot-diagnostics -->
-
-`foo.pyi`:
-
-```pyi
-def x(self, y: str): ...
-```
-
-`bar.pyi`:
-
-```pyi
-import foo
-
-class A:
-    def x(self, y: int): ...
-
-class B(A):
-    x = foo.x  # error: [invalid-method-override]
-
-class C:
-    x = foo.x
-
-class D(C):
-    def x(self, y: int): ...  # error: [invalid-method-override]
-```
-
-## Bad override of `__eq__`
-
-<!-- snapshot-diagnostics -->
-
-```py
-class Bad:
-    x: int
-    def __eq__(self, other: "Bad") -> bool:  # error: [invalid-method-override]
-        return self.x == other.x
-```
-
-## Synthesized methods
-
-`NamedTuple` classes and dataclasses both have methods generated at runtime that do not have
-source-code definitions. There are several scenarios to consider here:
-
-1. A synthesized method on a superclass is overridden by a "normal" (not synthesized) method on a
-    subclass
-1. A "normal" method on a superclass is overridden by a synthesized method on a subclass
-1. A synthesized method on a superclass is overridden by a synthesized method on a subclass
-
-<!-- snapshot-diagnostics -->
-
-```pyi
-from dataclasses import dataclass
-from typing import NamedTuple
-
-@dataclass(order=True)
-class Foo:
-    x: int
-
-class Bar(Foo):
-    def __lt__(self, other: Bar) -> bool: ...  # error: [invalid-method-override]
-
-# TODO: specifying `order=True` on the subclass means that a `__lt__` method is
-# generated that is incompatible with the generated `__lt__` method on the superclass.
-# We could consider detecting this and emitting a diagnostic, though maybe it shouldn't
-# be `invalid-method-override` since we'd emit it on the class definition rather than
-# on any method definition. Note also that no other type checker complains about this
-# as of 2025-11-21.
-@dataclass(order=True)
-class Bar2(Foo):
-    y: str
-
-# TODO: Although this class does not override any methods of `Foo`, the design of the
-# `order=True` stdlib dataclasses feature itself arguably violates the Liskov Substitution
-# Principle! Instances of `Bar3` cannot be substituted wherever an instance of `Foo` is
-# expected, because the generated `__lt__` method on `Foo` raises an error unless the r.h.s.
-# and `l.h.s.` have exactly the same `__class__` (it does not permit instances of `Foo` to
-# be compared with instances of subclasses of `Foo`).
-#
-# Many users would probably like their type checkers to alert them to cases where instances
-# of subclasses cannot be substituted for instances of superclasses, as this violates many
-# assumptions a type checker will make and makes it likely that a type checker will fail to
-# catch type errors elsewhere in the user's code. We could therefore consider treating all
-# `order=True` dataclasses as implicitly `@final` in order to enforce soundness. However,
-# this probably shouldn't be reported with the same error code as Liskov violations, since
-# the error does not stem from any method signatures written by the user. The example is
-# only included here for completeness.
-#
-# Note that no other type checker catches this error as of 2025-11-21.
-class Bar3(Foo): ...
-
-class Eggs:
-    def __lt__(self, other: Eggs) -> bool: ...
-
-# TODO: the generated `Ham.__lt__` method here incompatibly overrides `Eggs.__lt__`.
-# We could consider emitting a diagnostic here. As of 2025-11-21, mypy reports a
-# diagnostic here but pyright and pyrefly do not.
-@dataclass(order=True)
-class Ham(Eggs):
-    x: int
-
-class Baz(NamedTuple):
-    x: int
-
-class Spam(Baz):
-    def _asdict(self) -> tuple[int, ...]: ...  # error: [invalid-method-override]
-```
--- a/crates/ty_python_semantic/resources/mdtest/protocols.md
+++ b/crates/ty_python_semantic/resources/mdtest/protocols.md
@@ -3069,15 +3069,18 @@ from typing import Protocol
 from ty_extensions import static_assert, is_subtype_of, is_equivalent_to, is_disjoint_from

 class HasRepr(Protocol):
-    # error: [invalid-method-override]
+    # TODO: we should emit a diagnostic here complaining about a Liskov violation
+    # (it incompatibly overrides `__repr__` from `object`, a supertype of `HasRepr`)
    def __repr__(self) -> object: ...

 class HasReprRecursive(Protocol):
-    # error: [invalid-method-override]
+    # TODO: we should emit a diagnostic here complaining about a Liskov violation
+    # (it incompatibly overrides `__repr__` from `object`, a supertype of `HasReprRecursive`)
    def __repr__(self) -> "HasReprRecursive": ...

 class HasReprRecursiveAndFoo(Protocol):
-    # error: [invalid-method-override]
+    # TODO: we should emit a diagnostic here complaining about a Liskov violation
+    # (it incompatibly overrides `__repr__` from `object`, a supertype of `HasReprRecursiveAndFoo`)
    def __repr__(self) -> "HasReprRecursiveAndFoo": ...
    foo: int

@@ -3177,33 +3180,6 @@ from ty_extensions import reveal_protocol_interface
 reveal_protocol_interface(Foo)
 ```

-## Known panics
-
-### Protocols generic over TypeVars bound to forward references
-
-This test currently panics because the `ClassLiteral::explicit_bases` query fails to converge. See
-issue <https://github.com/astral-sh/ty/issues/1587>.
-
-<!-- expect-panic: execute: too many cycle iterations -->
-
-```py
-from typing import Any, Protocol, TypeVar
-
-T1 = TypeVar("T1", bound="A2[Any]")
-T2 = TypeVar("T2", bound="A1[Any]")
-T3 = TypeVar("T3", bound="B2[Any]")
-T4 = TypeVar("T4", bound="B1[Any]")
-
-class A1(Protocol[T1]):
-    def get_x(self): ...
-
-class A2(Protocol[T2]):
-    def get_y(self): ...
-
-class B1(A1[T3], Protocol[T3]): ...
-class B2(A2[T4], Protocol[T4]): ...
-```
-
 ## TODO

 Add tests for:
--- a/crates/ty_python_semantic/resources/mdtest/snapshots/liskov.md_-_The_Liskov_Substitut…_-_Bad_override_of_`__e…_(4b336040d5332220).snap
+++ b/crates/ty_python_semantic/resources/mdtest/snapshots/liskov.md_-_The_Liskov_Substitut…_-_Bad_override_of_`__e…_(4b336040d5332220).snap
@@ -1,52 +0,0 @@
---
-source: crates/ty_test/src/lib.rs
-expression: snapshot
---
---
-mdtest name: liskov.md - The Liskov Substitution Principle - Bad override of `__eq__`
-mdtest path: crates/ty_python_semantic/resources/mdtest/liskov.md
---
-
-# Python source files
-
-## mdtest_snippet.py
-
-```
-1 | class Bad:
-2 |     x: int
-3 |     def __eq__(self, other: "Bad") -> bool:  # error: [invalid-method-override]
-4 |         return self.x == other.x
-```
-
-# Diagnostics
-
-```
-error[invalid-method-override]: Invalid override of method `__eq__`
-   --> src/mdtest_snippet.py:3:9
-    |
-  1 | class Bad:
-  2 |     x: int
-  3 |     def __eq__(self, other: "Bad") -> bool:  # error: [invalid-method-override]
-    |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Definition is incompatible with `object.__eq__`
-  4 |         return self.x == other.x
-    |
-   ::: stdlib/builtins.pyi:142:9
-    |
-140 |     def __setattr__(self, name: str, value: Any, /) -> None: ...
-141 |     def __delattr__(self, name: str, /) -> None: ...
-142 |     def __eq__(self, value: object, /) -> bool: ...
-    |         -------------------------------------- `object.__eq__` defined here
-143 |     def __ne__(self, value: object, /) -> bool: ...
-144 |     def __str__(self) -> str: ...  # noqa: Y029
-    |
-info: This violates the Liskov Substitution Principle
-help: It is recommended for `__eq__` to work with arbitrary objects, for example:
-help
-help:     def __eq__(self, other: object) -> bool:
-help:         if not isinstance(other, Bad):
-help:             return False
-help:         return <logic to compare two `Bad` instances>
-help
-info: rule `invalid-method-override` is enabled by default
-
-```
--- a/crates/ty_python_semantic/resources/mdtest/snapshots/liskov.md_-_The_Liskov_Substitut…_-_Edge_case___function_…_(c8756a54d1cb8499).snap
+++ b/crates/ty_python_semantic/resources/mdtest/snapshots/liskov.md_-_The_Liskov_Substitut…_-_Edge_case___function_…_(c8756a54d1cb8499).snap
@@ -1,82 +0,0 @@
---
-source: crates/ty_test/src/lib.rs
-expression: snapshot
---
---
-mdtest name: liskov.md - The Liskov Substitution Principle - Edge case: function defined in another module and then assigned in a class body
-mdtest path: crates/ty_python_semantic/resources/mdtest/liskov.md
---
-
-# Python source files
-
-## foo.pyi
-
-```
-1 | def x(self, y: str): ...
-```
-
-## bar.pyi
-
-```
- 1 | import foo
- 2 | 
- 3 | class A:
- 4 |     def x(self, y: int): ...
- 5 | 
- 6 | class B(A):
- 7 |     x = foo.x  # error: [invalid-method-override]
- 8 | 
- 9 | class C:
-10 |     x = foo.x
-11 | 
-12 | class D(C):
-13 |     def x(self, y: int): ...  # error: [invalid-method-override]
-```
-
-# Diagnostics
-
-```
-error[invalid-method-override]: Invalid override of method `x`
- --> src/bar.pyi:4:9
-  |
-3 | class A:
-4 |     def x(self, y: int): ...
-  |         --------------- `A.x` defined here
-5 |
-6 | class B(A):
-7 |     x = foo.x  # error: [invalid-method-override]
-  |     ^^^^^^^^^ Definition is incompatible with `A.x`
-8 |
-9 | class C:
-  |
- ::: src/foo.pyi:1:5
-  |
-1 | def x(self, y: str): ...
-  |     --------------- Signature of `B.x`
-  |
-info: This violates the Liskov Substitution Principle
-info: rule `invalid-method-override` is enabled by default
-
-```
-
-```
-error[invalid-method-override]: Invalid override of method `x`
-  --> src/bar.pyi:10:5
-   |
- 9 | class C:
-10 |     x = foo.x
-   |     --------- `C.x` defined here
-11 |
-12 | class D(C):
-13 |     def x(self, y: int): ...  # error: [invalid-method-override]
-   |         ^^^^^^^^^^^^^^^ Definition is incompatible with `C.x`
-   |
-  ::: src/foo.pyi:1:5
-   |
- 1 | def x(self, y: str): ...
-   |     --------------- Signature of `C.x`
-   |
-info: This violates the Liskov Substitution Principle
-info: rule `invalid-method-override` is enabled by default
-
-```
--- a/crates/ty_python_semantic/resources/mdtest/snapshots/liskov.md_-_The_Liskov_Substitut…_-_Fully_qualified_name…_(8f6f7c5aace58329).snap
+++ b/crates/ty_python_semantic/resources/mdtest/snapshots/liskov.md_-_The_Liskov_Substitut…_-_Fully_qualified_name…_(8f6f7c5aace58329).snap
@@ -1,47 +0,0 @@
---
-source: crates/ty_test/src/lib.rs
-expression: snapshot
---
---
-mdtest name: liskov.md - The Liskov Substitution Principle - Fully qualified names are used in diagnostics where appropriate
-mdtest path: crates/ty_python_semantic/resources/mdtest/liskov.md
---
-
-# Python source files
-
-## a.pyi
-
-```
-1 | class A:
-2 |     def foo(self, x): ...
-```
-
-## b.pyi
-
-```
-1 | import a
-2 | 
-3 | class A(a.A):
-4 |     def foo(self, y): ...  # error: [invalid-method-override]
-```
-
-# Diagnostics
-
-```
-error[invalid-method-override]: Invalid override of method `foo`
- --> src/b.pyi:4:9
-  |
-3 | class A(a.A):
-4 |     def foo(self, y): ...  # error: [invalid-method-override]
-  |         ^^^^^^^^^^^^ Definition is incompatible with `a.A.foo`
-  |
- ::: src/a.pyi:2:9
-  |
-1 | class A:
-2 |     def foo(self, x): ...
-  |         ------------ `a.A.foo` defined here
-  |
-info: This violates the Liskov Substitution Principle
-info: rule `invalid-method-override` is enabled by default
-
-```
--- a/crates/ty_python_semantic/resources/mdtest/snapshots/liskov.md_-_The_Liskov_Substitut…_-_Method_parameters_(d98059266bcc1e13).snap
+++ b/crates/ty_python_semantic/resources/mdtest/snapshots/liskov.md_-_The_Liskov_Substitut…_-_Method_parameters_(d98059266bcc1e13).snap
@@ -1,331 +0,0 @@
---
-source: crates/ty_test/src/lib.rs
-expression: snapshot
---
---
-mdtest name: liskov.md - The Liskov Substitution Principle - Method parameters
-mdtest path: crates/ty_python_semantic/resources/mdtest/liskov.md
---
-
-# Python source files
-
-## mdtest_snippet.pyi
-
-```
- 1 | class Super:
- 2 |     def method(self, x: int, /): ...
- 3 | 
- 4 | class Sub1(Super):
- 5 |     def method(self, x: int, /): ...  # fine
- 6 | 
- 7 | class Sub2(Super):
- 8 |     def method(self, x: object, /): ...  # fine: `method` still accepts any argument of type `int`
- 9 | 
-10 | class Sub4(Super):
-11 |     def method(self, x: int | str, /): ...  # fine
-12 | 
-13 | class Sub5(Super):
-14 |     def method(self, x: int): ...  # fine: `x` can still be passed positionally
-15 | 
-16 | class Sub6(Super):
-17 |     # fine: `method()` can still be called with just a single argument
-18 |     def method(self, x: int, *args): ...
-19 | 
-20 | class Sub7(Super):
-21 |     def method(self, x: int, **kwargs): ...  # fine
-22 | 
-23 | class Sub8(Super):
-24 |     def method(self, x: int, *args, **kwargs): ...  # fine
-25 | 
-26 | class Sub9(Super):
-27 |     def method(self, x: int, extra_positional_arg=42, /): ... # fine
-28 | 
-29 | class Sub10(Super):
-30 |     def method(self, x: int, extra_pos_or_kw_arg=42): ...  # fine
-31 | 
-32 | class Sub11(Super):
-33 |     def method(self, x: int, *, extra_kw_only_arg=42): ...  # fine
-34 | 
-35 | class Sub12(Super):
-36 |     # Some calls permitted by the superclass are now no longer allowed
-37 |     # (the method can no longer be passed any arguments!)
-38 |     def method(self, /): ...  # error: [invalid-method-override]
-39 | 
-40 | class Sub13(Super):
-41 |     # Some calls permitted by the superclass are now no longer allowed
-42 |     # (the method can no longer be passed exactly one argument!)
-43 |     def method(self, x, y, /): ...  # error: [invalid-method-override]
-44 | 
-45 | class Sub14(Super):
-46 |     # Some calls permitted by the superclass are now no longer allowed
-47 |     # (x can no longer be passed positionally!)
-48 |     def method(self, /, *, x): ...  # error: [invalid-method-override]
-49 | 
-50 | class Sub15(Super):
-51 |     # Some calls permitted by the superclass are now no longer allowed
-52 |     # (x can no longer be passed any integer -- it now requires a bool!)
-53 |     def method(self, x: bool, /): ...  # error: [invalid-method-override]
-54 | 
-55 | class Super2:
-56 |     def method2(self, x): ...
-57 | 
-58 | class Sub16(Super2):
-59 |     def method2(self, x, /): ...  # error: [invalid-method-override]
-60 | 
-61 | class Sub17(Super2):
-62 |     def method2(self, *, x): ...  # error: [invalid-method-override]
-63 | 
-64 | class Super3:
-65 |     def method3(self, *, x): ...
-66 | 
-67 | class Sub18(Super3):
-68 |     def method3(self, x): ...  # fine: `x` can still be used as a keyword argument
-69 | 
-70 | class Sub19(Super3):
-71 |     def method3(self, x, /): ...  # error: [invalid-method-override]
-72 | 
-73 | class Super4:
-74 |     def method(self, *args: int, **kwargs: str): ...
-75 | 
-76 | class Sub20(Super4):
-77 |     def method(self, *args: object, **kwargs: object): ...  # fine
-78 | 
-79 | class Sub21(Super4):
-80 |     def method(self, *args): ...  # error: [invalid-method-override]
-81 | 
-82 | class Sub22(Super4):
-83 |     def method(self, **kwargs): ...  # error: [invalid-method-override]
-84 | 
-85 | class Sub23(Super4):
-86 |     def method(self, x, *args, y, **kwargs): ...  # error: [invalid-method-override]
-```
-
-# Diagnostics
-
-```
-error[invalid-method-override]: Invalid override of method `method`
-  --> src/mdtest_snippet.pyi:38:9
-   |
-36 |     # Some calls permitted by the superclass are now no longer allowed
-37 |     # (the method can no longer be passed any arguments!)
-38 |     def method(self, /): ...  # error: [invalid-method-override]
-   |         ^^^^^^^^^^^^^^^ Definition is incompatible with `Super.method`
-39 |
-40 | class Sub13(Super):
-   |
-  ::: src/mdtest_snippet.pyi:2:9
-   |
- 1 | class Super:
- 2 |     def method(self, x: int, /): ...
-   |         ----------------------- `Super.method` defined here
- 3 |
- 4 | class Sub1(Super):
-   |
-info: This violates the Liskov Substitution Principle
-info: rule `invalid-method-override` is enabled by default
-
-```
-
-```
-error[invalid-method-override]: Invalid override of method `method`
-  --> src/mdtest_snippet.pyi:43:9
-   |
-41 |     # Some calls permitted by the superclass are now no longer allowed
-42 |     # (the method can no longer be passed exactly one argument!)
-43 |     def method(self, x, y, /): ...  # error: [invalid-method-override]
-   |         ^^^^^^^^^^^^^^^^^^^^^ Definition is incompatible with `Super.method`
-44 |
-45 | class Sub14(Super):
-   |
-  ::: src/mdtest_snippet.pyi:2:9
-   |
- 1 | class Super:
- 2 |     def method(self, x: int, /): ...
-   |         ----------------------- `Super.method` defined here
- 3 |
- 4 | class Sub1(Super):
-   |
-info: This violates the Liskov Substitution Principle
-info: rule `invalid-method-override` is enabled by default
-
-```
-
-```
-error[invalid-method-override]: Invalid override of method `method`
-  --> src/mdtest_snippet.pyi:48:9
-   |
-46 |     # Some calls permitted by the superclass are now no longer allowed
-47 |     # (x can no longer be passed positionally!)
-48 |     def method(self, /, *, x): ...  # error: [invalid-method-override]
-   |         ^^^^^^^^^^^^^^^^^^^^^ Definition is incompatible with `Super.method`
-49 |
-50 | class Sub15(Super):
-   |
-  ::: src/mdtest_snippet.pyi:2:9
-   |
- 1 | class Super:
- 2 |     def method(self, x: int, /): ...
-   |         ----------------------- `Super.method` defined here
- 3 |
- 4 | class Sub1(Super):
-   |
-info: This violates the Liskov Substitution Principle
-info: rule `invalid-method-override` is enabled by default
-
-```
-
-```
-error[invalid-method-override]: Invalid override of method `method`
-  --> src/mdtest_snippet.pyi:53:9
-   |
-51 |     # Some calls permitted by the superclass are now no longer allowed
-52 |     # (x can no longer be passed any integer -- it now requires a bool!)
-53 |     def method(self, x: bool, /): ...  # error: [invalid-method-override]
-   |         ^^^^^^^^^^^^^^^^^^^^^^^^ Definition is incompatible with `Super.method`
-54 |
-55 | class Super2:
-   |
-  ::: src/mdtest_snippet.pyi:2:9
-   |
- 1 | class Super:
- 2 |     def method(self, x: int, /): ...
-   |         ----------------------- `Super.method` defined here
- 3 |
- 4 | class Sub1(Super):
-   |
-info: This violates the Liskov Substitution Principle
-info: rule `invalid-method-override` is enabled by default
-
-```
-
-```
-error[invalid-method-override]: Invalid override of method `method2`
-  --> src/mdtest_snippet.pyi:56:9
-   |
-55 | class Super2:
-56 |     def method2(self, x): ...
-   |         ---------------- `Super2.method2` defined here
-57 |
-58 | class Sub16(Super2):
-59 |     def method2(self, x, /): ...  # error: [invalid-method-override]
-   |         ^^^^^^^^^^^^^^^^^^^ Definition is incompatible with `Super2.method2`
-60 |
-61 | class Sub17(Super2):
-   |
-info: This violates the Liskov Substitution Principle
-info: rule `invalid-method-override` is enabled by default
-
-```
-
-```
-error[invalid-method-override]: Invalid override of method `method2`
-  --> src/mdtest_snippet.pyi:62:9
-   |
-61 | class Sub17(Super2):
-62 |     def method2(self, *, x): ...  # error: [invalid-method-override]
-   |         ^^^^^^^^^^^^^^^^^^^ Definition is incompatible with `Super2.method2`
-63 |
-64 | class Super3:
-   |
-  ::: src/mdtest_snippet.pyi:56:9
-   |
-55 | class Super2:
-56 |     def method2(self, x): ...
-   |         ---------------- `Super2.method2` defined here
-57 |
-58 | class Sub16(Super2):
-   |
-info: This violates the Liskov Substitution Principle
-info: rule `invalid-method-override` is enabled by default
-
-```
-
-```
-error[invalid-method-override]: Invalid override of method `method3`
-  --> src/mdtest_snippet.pyi:71:9
-   |
-70 | class Sub19(Super3):
-71 |     def method3(self, x, /): ...  # error: [invalid-method-override]
-   |         ^^^^^^^^^^^^^^^^^^^ Definition is incompatible with `Super3.method3`
-72 |
-73 | class Super4:
-   |
-  ::: src/mdtest_snippet.pyi:65:9
-   |
-64 | class Super3:
-65 |     def method3(self, *, x): ...
-   |         ------------------- `Super3.method3` defined here
-66 |
-67 | class Sub18(Super3):
-   |
-info: This violates the Liskov Substitution Principle
-info: rule `invalid-method-override` is enabled by default
-
-```
-
-```
-error[invalid-method-override]: Invalid override of method `method`
-  --> src/mdtest_snippet.pyi:80:9
-   |
-79 | class Sub21(Super4):
-80 |     def method(self, *args): ...  # error: [invalid-method-override]
-   |         ^^^^^^^^^^^^^^^^^^^ Definition is incompatible with `Super4.method`
-81 |
-82 | class Sub22(Super4):
-   |
-  ::: src/mdtest_snippet.pyi:74:9
-   |
-73 | class Super4:
-74 |     def method(self, *args: int, **kwargs: str): ...
-   |         --------------------------------------- `Super4.method` defined here
-75 |
-76 | class Sub20(Super4):
-   |
-info: This violates the Liskov Substitution Principle
-info: rule `invalid-method-override` is enabled by default
-
-```
-
-```
-error[invalid-method-override]: Invalid override of method `method`
-  --> src/mdtest_snippet.pyi:83:9
-   |
-82 | class Sub22(Super4):
-83 |     def method(self, **kwargs): ...  # error: [invalid-method-override]
-   |         ^^^^^^^^^^^^^^^^^^^^^^ Definition is incompatible with `Super4.method`
-84 |
-85 | class Sub23(Super4):
-   |
-  ::: src/mdtest_snippet.pyi:74:9
-   |
-73 | class Super4:
-74 |     def method(self, *args: int, **kwargs: str): ...
-   |         --------------------------------------- `Super4.method` defined here
-75 |
-76 | class Sub20(Super4):
-   |
-info: This violates the Liskov Substitution Principle
-info: rule `invalid-method-override` is enabled by default
-
-```
-
-```
-error[invalid-method-override]: Invalid override of method `method`
-  --> src/mdtest_snippet.pyi:86:9
-   |
-85 | class Sub23(Super4):
-86 |     def method(self, x, *args, y, **kwargs): ...  # error: [invalid-method-override]
-   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Definition is incompatible with `Super4.method`
-   |
-  ::: src/mdtest_snippet.pyi:74:9
-   |
-73 | class Super4:
-74 |     def method(self, *args: int, **kwargs: str): ...
-   |         --------------------------------------- `Super4.method` defined here
-75 |
-76 | class Sub20(Super4):
-   |
-info: This violates the Liskov Substitution Principle
-info: rule `invalid-method-override` is enabled by default
-
-```
--- a/crates/ty_python_semantic/resources/mdtest/snapshots/liskov.md_-_The_Liskov_Substitut…_-_Method_return_types_(3e0c19bed14cfacd).snap
+++ b/crates/ty_python_semantic/resources/mdtest/snapshots/liskov.md_-_The_Liskov_Substitut…_-_Method_return_types_(3e0c19bed14cfacd).snap
@@ -1,75 +0,0 @@
---
-source: crates/ty_test/src/lib.rs
-expression: snapshot
---
---
-mdtest name: liskov.md - The Liskov Substitution Principle - Method return types
-mdtest path: crates/ty_python_semantic/resources/mdtest/liskov.md
---
-
-# Python source files
-
-## mdtest_snippet.pyi
-
-```
- 1 | class Super:
- 2 |     def method(self) -> int: ...
- 3 | 
- 4 | class Sub1(Super):
- 5 |     def method(self) -> int: ...  # fine
- 6 | 
- 7 | class Sub2(Super):
- 8 |     def method(self) -> bool: ...  # fine: `bool` is a subtype of `int`
- 9 | 
-10 | class Sub3(Super):
-11 |     def method(self) -> object: ...  # error: [invalid-method-override]
-12 | 
-13 | class Sub4(Super):
-14 |     def method(self) -> str: ...  # error: [invalid-method-override]
-```
-
-# Diagnostics
-
-```
-error[invalid-method-override]: Invalid override of method `method`
-  --> src/mdtest_snippet.pyi:11:9
-   |
-10 | class Sub3(Super):
-11 |     def method(self) -> object: ...  # error: [invalid-method-override]
-   |         ^^^^^^^^^^^^^^^^^^^^^^ Definition is incompatible with `Super.method`
-12 |
-13 | class Sub4(Super):
-   |
-  ::: src/mdtest_snippet.pyi:2:9
-   |
- 1 | class Super:
- 2 |     def method(self) -> int: ...
-   |         ------------------- `Super.method` defined here
- 3 |
- 4 | class Sub1(Super):
-   |
-info: This violates the Liskov Substitution Principle
-info: rule `invalid-method-override` is enabled by default
-
-```
-
-```
-error[invalid-method-override]: Invalid override of method `method`
-  --> src/mdtest_snippet.pyi:14:9
-   |
-13 | class Sub4(Super):
-14 |     def method(self) -> str: ...  # error: [invalid-method-override]
-   |         ^^^^^^^^^^^^^^^^^^^ Definition is incompatible with `Super.method`
-   |
-  ::: src/mdtest_snippet.pyi:2:9
-   |
- 1 | class Super:
- 2 |     def method(self) -> int: ...
-   |         ------------------- `Super.method` defined here
- 3 |
- 4 | class Sub1(Super):
-   |
-info: This violates the Liskov Substitution Principle
-info: rule `invalid-method-override` is enabled by default
-
-```
--- a/crates/ty_python_semantic/resources/mdtest/snapshots/liskov.md_-_The_Liskov_Substitut…_-_Synthesized_methods_(9e6e6c7368530460).snap
+++ b/crates/ty_python_semantic/resources/mdtest/snapshots/liskov.md_-_The_Liskov_Substitut…_-_Synthesized_methods_(9e6e6c7368530460).snap
@@ -1,116 +0,0 @@
---
-source: crates/ty_test/src/lib.rs
-expression: snapshot
---
---
-mdtest name: liskov.md - The Liskov Substitution Principle - Synthesized methods
-mdtest path: crates/ty_python_semantic/resources/mdtest/liskov.md
---
-
-# Python source files
-
-## mdtest_snippet.pyi
-
-```
- 1 | from dataclasses import dataclass
- 2 | from typing import NamedTuple
- 3 | 
- 4 | @dataclass(order=True)
- 5 | class Foo:
- 6 |     x: int
- 7 | 
- 8 | class Bar(Foo):
- 9 |     def __lt__(self, other: Bar) -> bool: ...  # error: [invalid-method-override]
-10 | 
-11 | # TODO: specifying `order=True` on the subclass means that a `__lt__` method is
-12 | # generated that is incompatible with the generated `__lt__` method on the superclass.
-13 | # We could consider detecting this and emitting a diagnostic, though maybe it shouldn't
-14 | # be `invalid-method-override` since we'd emit it on the class definition rather than
-15 | # on any method definition. Note also that no other type checker complains about this
-16 | # as of 2025-11-21.
-17 | @dataclass(order=True)
-18 | class Bar2(Foo):
-19 |     y: str
-20 | 
-21 | # TODO: Although this class does not override any methods of `Foo`, the design of the
-22 | # `order=True` stdlib dataclasses feature itself arguably violates the Liskov Substitution
-23 | # Principle! Instances of `Bar3` cannot be substituted wherever an instance of `Foo` is
-24 | # expected, because the generated `__lt__` method on `Foo` raises an error unless the r.h.s.
-25 | # and `l.h.s.` have exactly the same `__class__` (it does not permit instances of `Foo` to
-26 | # be compared with instances of subclasses of `Foo`).
-27 | #
-28 | # Many users would probably like their type checkers to alert them to cases where instances
-29 | # of subclasses cannot be substituted for instances of superclasses, as this violates many
-30 | # assumptions a type checker will make and makes it likely that a type checker will fail to
-31 | # catch type errors elsewhere in the user's code. We could therefore consider treating all
-32 | # `order=True` dataclasses as implicitly `@final` in order to enforce soundness. However,
-33 | # this probably shouldn't be reported with the same error code as Liskov violations, since
-34 | # the error does not stem from any method signatures written by the user. The example is
-35 | # only included here for completeness.
-36 | #
-37 | # Note that no other type checker catches this error as of 2025-11-21.
-38 | class Bar3(Foo): ...
-39 | 
-40 | class Eggs:
-41 |     def __lt__(self, other: Eggs) -> bool: ...
-42 | 
-43 | # TODO: the generated `Ham.__lt__` method here incompatibly overrides `Eggs.__lt__`.
-44 | # We could consider emitting a diagnostic here. As of 2025-11-21, mypy reports a
-45 | # diagnostic here but pyright and pyrefly do not.
-46 | @dataclass(order=True)
-47 | class Ham(Eggs):
-48 |     x: int
-49 | 
-50 | class Baz(NamedTuple):
-51 |     x: int
-52 | 
-53 | class Spam(Baz):
-54 |     def _asdict(self) -> tuple[int, ...]: ...  # error: [invalid-method-override]
-```
-
-# Diagnostics
-
-```
-error[invalid-method-override]: Invalid override of method `__lt__`
-  --> src/mdtest_snippet.pyi:9:9
-   |
- 8 | class Bar(Foo):
- 9 |     def __lt__(self, other: Bar) -> bool: ...  # error: [invalid-method-override]
-   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Definition is incompatible with `Foo.__lt__`
-10 |
-11 | # TODO: specifying `order=True` on the subclass means that a `__lt__` method is
-   |
-info: This violates the Liskov Substitution Principle
-info: `Foo.__lt__` is a generated method created because `Foo` is a dataclass
- --> src/mdtest_snippet.pyi:5:7
-  |
-4 | @dataclass(order=True)
-5 | class Foo:
-  |       ^^^ Definition of `Foo`
-6 |     x: int
-  |
-info: rule `invalid-method-override` is enabled by default
-
-```
-
-```
-error[invalid-method-override]: Invalid override of method `_asdict`
-  --> src/mdtest_snippet.pyi:54:9
-   |
-53 | class Spam(Baz):
-54 |     def _asdict(self) -> tuple[int, ...]: ...  # error: [invalid-method-override]
-   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Definition is incompatible with `Baz._asdict`
-   |
-info: This violates the Liskov Substitution Principle
-info: `Baz._asdict` is a generated method created because `Baz` inherits from `typing.NamedTuple`
-  --> src/mdtest_snippet.pyi:50:7
-   |
-48 |     x: int
-49 |
-50 | class Baz(NamedTuple):
-   |       ^^^^^^^^^^^^^^^ Definition of `Baz`
-51 |     x: int
-   |
-info: rule `invalid-method-override` is enabled by default
-
-```
--- a/crates/ty_python_semantic/resources/mdtest/snapshots/liskov.md_-_The_Liskov_Substitut…_-_The_entire_class_hie…_(5e8fca10d966c36e).snap
+++ b/crates/ty_python_semantic/resources/mdtest/snapshots/liskov.md_-_The_Liskov_Substitut…_-_The_entire_class_hie…_(5e8fca10d966c36e).snap
@@ -1,192 +0,0 @@
---
-source: crates/ty_test/src/lib.rs
-expression: snapshot
---
---
-mdtest name: liskov.md - The Liskov Substitution Principle - The entire class hierarchy is checked
-mdtest path: crates/ty_python_semantic/resources/mdtest/liskov.md
---
-
-# Python source files
-
-## stub.pyi
-
-```
- 1 | from typing import Any
- 2 | 
- 3 | class Grandparent:
- 4 |     def method(self, x: int) -> None: ...
- 5 | 
- 6 | class Parent(Grandparent):
- 7 |     def method(self, x: str) -> None: ...  # error: [invalid-method-override]
- 8 | 
- 9 | class Child(Parent):
-10 |     # compatible with the signature of `Parent.method`, but not with `Grandparent.method`:
-11 |     def method(self, x: str) -> None: ...  # error: [invalid-method-override]
-12 | 
-13 | class OtherChild(Parent):
-14 |     # compatible with the signature of `Grandparent.method`, but not with `Parent.method`:
-15 |     def method(self, x: int) -> None: ...  # error: [invalid-method-override]
-16 | 
-17 | class GradualParent(Grandparent):
-18 |     def method(self, x: Any) -> None: ...
-19 | 
-20 | class ThirdChild(GradualParent):
-21 |     # `GradualParent.method` is compatible with the signature of `Grandparent.method`,
-22 |     # and `ThirdChild.method` is compatible with the signature of `GradualParent.method`,
-23 |     # but `ThirdChild.method` is not compatible with the signature of `Grandparent.method`
-24 |     def method(self, x: str) -> None: ...  # error: [invalid-method-override]
-```
-
-## other_stub.pyi
-
-```
- 1 | class A:
- 2 |     def get(self, default): ...
- 3 | 
- 4 | class B(A):
- 5 |     def get(self, default, /): ...  # error: [invalid-method-override]
- 6 | 
- 7 | get = 56
- 8 | 
- 9 | class C(B):
-10 |     # `get` appears in the symbol table of `C`,
-11 |     # but that doesn't confuse our diagnostic...
-12 |     foo = get
-13 | 
-14 | class D(C):
-15 |     # compatible with `C.get` and `B.get`, but not with `A.get`
-16 |     def get(self, my_default): ...  # error: [invalid-method-override]
-```
-
-# Diagnostics
-
-```
-error[invalid-method-override]: Invalid override of method `method`
- --> src/stub.pyi:4:9
-  |
-3 | class Grandparent:
-4 |     def method(self, x: int) -> None: ...
-  |         ---------------------------- `Grandparent.method` defined here
-5 |
-6 | class Parent(Grandparent):
-7 |     def method(self, x: str) -> None: ...  # error: [invalid-method-override]
-  |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Definition is incompatible with `Grandparent.method`
-8 |
-9 | class Child(Parent):
-  |
-info: This violates the Liskov Substitution Principle
-info: rule `invalid-method-override` is enabled by default
-
-```
-
-```
-error[invalid-method-override]: Invalid override of method `method`
-  --> src/stub.pyi:11:9
-   |
- 9 | class Child(Parent):
-10 |     # compatible with the signature of `Parent.method`, but not with `Grandparent.method`:
-11 |     def method(self, x: str) -> None: ...  # error: [invalid-method-override]
-   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Definition is incompatible with `Grandparent.method`
-12 |
-13 | class OtherChild(Parent):
-   |
-  ::: src/stub.pyi:4:9
-   |
- 3 | class Grandparent:
- 4 |     def method(self, x: int) -> None: ...
-   |         ---------------------------- `Grandparent.method` defined here
- 5 |
- 6 | class Parent(Grandparent):
-   |
-info: This violates the Liskov Substitution Principle
-info: rule `invalid-method-override` is enabled by default
-
-```
-
-```
-error[invalid-method-override]: Invalid override of method `method`
-  --> src/stub.pyi:15:9
-   |
-13 | class OtherChild(Parent):
-14 |     # compatible with the signature of `Grandparent.method`, but not with `Parent.method`:
-15 |     def method(self, x: int) -> None: ...  # error: [invalid-method-override]
-   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Definition is incompatible with `Parent.method`
-16 |
-17 | class GradualParent(Grandparent):
-   |
-  ::: src/stub.pyi:7:9
-   |
- 6 | class Parent(Grandparent):
- 7 |     def method(self, x: str) -> None: ...  # error: [invalid-method-override]
-   |         ---------------------------- `Parent.method` defined here
- 8 |
- 9 | class Child(Parent):
-   |
-info: This violates the Liskov Substitution Principle
-info: rule `invalid-method-override` is enabled by default
-
-```
-
-```
-error[invalid-method-override]: Invalid override of method `method`
-  --> src/stub.pyi:24:9
-   |
-22 |     # and `ThirdChild.method` is compatible with the signature of `GradualParent.method`,
-23 |     # but `ThirdChild.method` is not compatible with the signature of `Grandparent.method`
-24 |     def method(self, x: str) -> None: ...  # error: [invalid-method-override]
-   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Definition is incompatible with `Grandparent.method`
-   |
-  ::: src/stub.pyi:4:9
-   |
- 3 | class Grandparent:
- 4 |     def method(self, x: int) -> None: ...
-   |         ---------------------------- `Grandparent.method` defined here
- 5 |
- 6 | class Parent(Grandparent):
-   |
-info: This violates the Liskov Substitution Principle
-info: rule `invalid-method-override` is enabled by default
-
-```
-
-```
-error[invalid-method-override]: Invalid override of method `get`
- --> src/other_stub.pyi:2:9
-  |
-1 | class A:
-2 |     def get(self, default): ...
-  |         ------------------ `A.get` defined here
-3 |
-4 | class B(A):
-5 |     def get(self, default, /): ...  # error: [invalid-method-override]
-  |         ^^^^^^^^^^^^^^^^^^^^^ Definition is incompatible with `A.get`
-6 |
-7 | get = 56
-  |
-info: This violates the Liskov Substitution Principle
-info: rule `invalid-method-override` is enabled by default
-
-```
-
-```
-error[invalid-method-override]: Invalid override of method `get`
-  --> src/other_stub.pyi:16:9
-   |
-14 | class D(C):
-15 |     # compatible with `C.get` and `B.get`, but not with `A.get`
-16 |     def get(self, my_default): ...  # error: [invalid-method-override]
-   |         ^^^^^^^^^^^^^^^^^^^^^ Definition is incompatible with `A.get`
-   |
-  ::: src/other_stub.pyi:2:9
-   |
- 1 | class A:
- 2 |     def get(self, default): ...
-   |         ------------------ `A.get` defined here
- 3 |
- 4 | class B(A):
-   |
-info: This violates the Liskov Substitution Principle
-info: rule `invalid-method-override` is enabled by default
-
-```
--- a/crates/ty_python_semantic/resources/mdtest/snapshots/mro.md_-_Method_Resolution_Or…_-_`bases`_lists_wi…_(ea7ebc83ec359b54).snap
+++ b/crates/ty_python_semantic/resources/mdtest/snapshots/mro.md_-_Method_Resolution_Or…_-_`bases`_lists_wi…_(ea7ebc83ec359b54).snap
@@ -303,13 +303,13 @@ info: rule `duplicate-base` is enabled by default
 ```

 ```
-info[unused-ignore-comment]: Unused blanket `type: ignore` directive
+info[unused-ignore-comment]
  --> src/mdtest_snippet.py:72:9
   |
 70 |     A,
 71 |     # error: [unused-ignore-comment]
 72 |     A,  # type: ignore[duplicate-base]
-   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Unused blanket `type: ignore` directive
 73 | ): ...
   |

@@ -346,13 +346,13 @@ info: rule `duplicate-base` is enabled by default
 ```

 ```
-info[unused-ignore-comment]: Unused blanket `type: ignore` directive
+info[unused-ignore-comment]
  --> src/mdtest_snippet.py:81:13
   |
 79 | ):
 80 |     # error: [unused-ignore-comment]
 81 |     x: int  # type: ignore[duplicate-base]
-   |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Unused blanket `type: ignore` directive
 82 |
 83 | # fmt: on
   |
--- a/crates/ty_python_semantic/resources/mdtest/snapshots/tuples.md_-_Comparison___Tuples_-_Equality_with_elemen…_(39b614d4707c0661).snap
+++ b/crates/ty_python_semantic/resources/mdtest/snapshots/tuples.md_-_Comparison___Tuples_-_Equality_with_elemen…_(39b614d4707c0661).snap
@@ -12,59 +12,27 @@ mdtest path: crates/ty_python_semantic/resources/mdtest/comparison/tuples.md
 ## mdtest_snippet.py

 ```
- 1 | class NotBoolable:
- 2 |     __bool__: None = None
- 3 | 
- 4 | class A:
- 5 |     # error: [invalid-method-override]
- 6 |     def __eq__(self, other) -> NotBoolable:
- 7 |         return NotBoolable()
- 8 | 
- 9 | # error: [unsupported-bool-conversion]
-10 | (A(),) == (A(),)
+1 | class NotBoolable:
+2 |     __bool__: None = None
+3 | 
+4 | class A:
+5 |     def __eq__(self, other) -> NotBoolable:
+6 |         return NotBoolable()
+7 | 
+8 | # error: [unsupported-bool-conversion]
+9 | (A(),) == (A(),)
 ```

 # Diagnostics

-```
-error[invalid-method-override]: Invalid override of method `__eq__`
-   --> src/mdtest_snippet.py:6:9
-    |
-  4 | class A:
-  5 |     # error: [invalid-method-override]
-  6 |     def __eq__(self, other) -> NotBoolable:
-    |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Definition is incompatible with `object.__eq__`
-  7 |         return NotBoolable()
-    |
-   ::: stdlib/builtins.pyi:142:9
-    |
-140 |     def __setattr__(self, name: str, value: Any, /) -> None: ...
-141 |     def __delattr__(self, name: str, /) -> None: ...
-142 |     def __eq__(self, value: object, /) -> bool: ...
-    |         -------------------------------------- `object.__eq__` defined here
-143 |     def __ne__(self, value: object, /) -> bool: ...
-144 |     def __str__(self) -> str: ...  # noqa: Y029
-    |
-info: This violates the Liskov Substitution Principle
-help: It is recommended for `__eq__` to work with arbitrary objects, for example:
-help
-help:     def __eq__(self, other: object) -> bool:
-help:         if not isinstance(other, A):
-help:             return False
-help:         return <logic to compare two `A` instances>
-help
-info: rule `invalid-method-override` is enabled by default
-
-```
-
 ```
 error[unsupported-bool-conversion]: Boolean conversion is unsupported for type `NotBoolable`
-  --> src/mdtest_snippet.py:10:1
-   |
- 9 | # error: [unsupported-bool-conversion]
-10 | (A(),) == (A(),)
-   | ^^^^^^^^^^^^^^^^
-   |
+ --> src/mdtest_snippet.py:9:1
+  |
+8 | # error: [unsupported-bool-conversion]
+9 | (A(),) == (A(),)
+  | ^^^^^^^^^^^^^^^^
+  |
 info: `__bool__` on `NotBoolable` must be callable
 info: rule `unsupported-bool-conversion` is enabled by default

--- a/crates/ty_python_semantic/src/module_name.rs
+++ b/crates/ty_python_semantic/src/module_name.rs
@@ -318,7 +318,7 @@ impl ModuleName {
        db: &dyn Db,
        importing_file: File,
    ) -> Result<Self, ModuleNameResolutionError> {
-        Self::from_identifier_parts(db, importing_file, None, 1)
+        relative_module_name(db, importing_file, None, NonZeroU32::new(1).unwrap())
    }
 }

--- a/crates/ty_python_semantic/src/semantic_index/builder.rs
+++ b/crates/ty_python_semantic/src/semantic_index/builder.rs
@@ -1513,33 +1513,42 @@ impl<'ast> Visitor<'ast> for SemanticIndexBuilder<'_, 'ast> {
                // that `x` can be freely overwritten, and that we don't assume that an import
                // in one function is visible in another function.
                let mut is_self_import = false;
-                if self.file.is_package(self.db)
-                    && let Ok(module_name) = ModuleName::from_identifier_parts(
-                        self.db,
-                        self.file,
-                        node.module.as_deref(),
-                        node.level,
-                    )
-                    && let Ok(thispackage) = ModuleName::package_for_file(self.db, self.file)
-                {
+                let is_package = self.file.is_package(self.db);
+                let this_package = ModuleName::package_for_file(self.db, self.file);
+
+                if let Ok(module_name) = ModuleName::from_identifier_parts(
+                    self.db,
+                    self.file,
+                    node.module.as_deref(),
+                    node.level,
+                ) {
                    // Record whether this is equivalent to `from . import ...`
-                    is_self_import = module_name == thispackage;
+                    if is_package && let Ok(thispackage) = this_package.as_ref() {
+                        is_self_import = &module_name == thispackage;
+                    }

-                    if node.module.is_some()
-                        && let Some(relative_submodule) = module_name.relative_to(&thispackage)
-                        && let Some(direct_submodule) = relative_submodule.components().next()
-                        && !self.seen_submodule_imports.contains(direct_submodule)
-                        && self.current_scope().is_global()
-                    {
-                        self.seen_submodule_imports
-                            .insert(direct_submodule.to_owned());
+                    if self.current_scope().is_global() && node.module.is_some() {
+                        if let Ok(thispackage) = this_package
+                            && let Some(relative_submodule) = module_name.relative_to(&thispackage)
+                        {
+                            if is_package
+                                && let Some(direct_submodule) =
+                                    relative_submodule.components().next()
+                                && !self.seen_submodule_imports.contains(direct_submodule)
+                            {
+                                self.seen_submodule_imports
+                                    .insert(direct_submodule.to_owned());

-                        let direct_submodule_name = Name::new(direct_submodule);
-                        let symbol = self.add_symbol(direct_submodule_name);
-                        self.add_definition(
-                            symbol.into(),
-                            ImportFromSubmoduleDefinitionNodeRef { node },
-                        );
+                                let direct_submodule_name = Name::new(direct_submodule);
+                                let symbol = self.add_symbol(direct_submodule_name);
+                                self.add_definition(
+                                    symbol.into(),
+                                    ImportFromSubmoduleDefinitionNodeRef { node },
+                                );
+                            }
+                        } else {
+                            self.imported_modules.insert(module_name);
+                        }
                    }
                }

--- a/crates/ty_python_semantic/src/semantic_index/definition.rs
+++ b/crates/ty_python_semantic/src/semantic_index/definition.rs
@@ -737,10 +737,6 @@ impl DefinitionKind<'_> {
        matches!(self, DefinitionKind::Assignment(_))
    }

-    pub(crate) const fn is_function_def(&self) -> bool {
-        matches!(self, DefinitionKind::Function(_))
-    }
-
    /// Returns the [`TextRange`] of the definition target.
    ///
    /// A definition target would mainly be the node representing the place being defined i.e.,
--- a/crates/ty_python_semantic/src/semantic_model.rs
+++ b/crates/ty_python_semantic/src/semantic_model.rs
@@ -31,10 +31,6 @@ impl<'db> SemanticModel<'db> {
        self.db
    }

-    pub fn file(&self) -> File {
-        self.file
-    }
-
    pub fn file_path(&self) -> &FilePath {
        self.file.path(self.db)
    }
@@ -74,17 +70,8 @@ impl<'db> SemanticModel<'db> {
        members
    }

-    /// Resolve the given import made in this file to a Type
-    pub fn resolve_module_type(&self, module: Option<&str>, level: u32) -> Option<Type<'db>> {
-        let module = self.resolve_module(module, level)?;
-        Some(Type::module_literal(self.db, self.file, module))
-    }
-
-    /// Resolve the given import made in this file to a Module
-    pub fn resolve_module(&self, module: Option<&str>, level: u32) -> Option<Module<'db>> {
-        let module_name =
-            ModuleName::from_identifier_parts(self.db, self.file, module, level).ok()?;
-        resolve_module(self.db, &module_name)
+    pub fn resolve_module(&self, module_name: &ModuleName) -> Option<Module<'_>> {
+        resolve_module(self.db, module_name)
    }

    /// Returns completions for symbols available in a `import <CURSOR>` context.
--- a/crates/ty_python_semantic/src/suppression.rs
+++ b/crates/ty_python_semantic/src/suppression.rs
@@ -297,10 +297,10 @@ impl<'a> CheckSuppressionsContext<'a> {
        };

        let id = DiagnosticId::Lint(lint.name());
-        let mut diag = Diagnostic::new(id, severity, message);
+        let mut diag = Diagnostic::new(id, severity, "");
        diag.set_documentation_url(Some(lint.documentation_url()));
        let span = Span::from(self.file).with_range(range);
-        diag.annotate(Annotation::primary(span));
+        diag.annotate(Annotation::primary(span).message(message));
        self.diagnostics.push(diag);
    }
 }
--- a/crates/ty_python_semantic/src/types.rs
+++ b/crates/ty_python_semantic/src/types.rs
@@ -95,7 +95,6 @@ mod generics;
 pub mod ide_support;
 mod infer;
 mod instance;
-mod liskov;
 mod member;
 mod mro;
 mod narrow;
@@ -1105,13 +1104,6 @@ impl<'db> Type<'db> {
        }
    }

-    pub(crate) const fn as_bound_method(self) -> Option<BoundMethodType<'db>> {
-        match self {
-            Type::BoundMethod(bound_method) => Some(bound_method),
-            _ => None,
-        }
-    }
-
    #[track_caller]
    pub(crate) const fn expect_class_literal(self) -> ClassLiteral<'db> {
        self.as_class_literal()
--- a/crates/ty_python_semantic/src/types/class.rs
+++ b/crates/ty_python_semantic/src/types/class.rs
@@ -1,5 +1,4 @@
 use std::cell::RefCell;
-use std::fmt::Write;
 use std::sync::{LazyLock, Mutex};

 use super::TypeVarVariance;
@@ -11,7 +10,7 @@ use super::{
 use crate::module_resolver::KnownModule;
 use crate::place::TypeOrigin;
 use crate::semantic_index::definition::{Definition, DefinitionState};
-use crate::semantic_index::scope::{NodeWithScopeKind, Scope, ScopeKind};
+use crate::semantic_index::scope::{NodeWithScopeKind, Scope};
 use crate::semantic_index::symbol::Symbol;
 use crate::semantic_index::{
    DeclarationWithConstraint, SemanticIndex, attribute_declarations, attribute_scopes,
@@ -3650,10 +3649,6 @@ impl<'db> ClassLiteral<'db> {
                .unwrap_or_else(|| class_name.end()),
        )
    }
-
-    pub(super) fn qualified_name(self, db: &'db dyn Db) -> QualifiedClassName<'db> {
-        QualifiedClassName { db, class: self }
-    }
 }

 impl<'db> From<ClassLiteral<'db>> for Type<'db> {
@@ -3788,74 +3783,6 @@ impl<'db> VarianceInferable<'db> for ClassLiteral<'db> {
    }
 }

-// N.B. It would be incorrect to derive `Eq`, `PartialEq`, or `Hash` for this struct,
-// because two `QualifiedClassName` instances might refer to different classes but
-// have the same components. You'd expect them to compare equal, but they'd compare
-// unequal if `PartialEq`/`Eq` were naively derived.
-#[derive(Clone, Copy)]
-pub(super) struct QualifiedClassName<'db> {
-    db: &'db dyn Db,
-    class: ClassLiteral<'db>,
-}
-
-impl QualifiedClassName<'_> {
-    /// Returns the components of the qualified name of this class, excluding this class itself.
-    ///
-    /// For example, calling this method on a class `C` in the module `a.b` would return
-    /// `["a", "b"]`. Calling this method on a class `D` inside the namespace of a method
-    /// `m` inside the namespace of a class `C` in the module `a.b` would return
-    /// `["a", "b", "C", "<locals of function 'm'>"]`.
-    pub(super) fn components_excluding_self(&self) -> Vec<String> {
-        let body_scope = self.class.body_scope(self.db);
-        let file = body_scope.file(self.db);
-        let module_ast = parsed_module(self.db, file).load(self.db);
-        let index = semantic_index(self.db, file);
-        let file_scope_id = body_scope.file_scope_id(self.db);
-
-        let mut name_parts = vec![];
-
-        // Skips itself
-        for (_, ancestor_scope) in index.ancestor_scopes(file_scope_id).skip(1) {
-            let node = ancestor_scope.node();
-
-            match ancestor_scope.kind() {
-                ScopeKind::Class => {
-                    if let Some(class_def) = node.as_class() {
-                        name_parts.push(class_def.node(&module_ast).name.as_str().to_string());
-                    }
-                }
-                ScopeKind::Function => {
-                    if let Some(function_def) = node.as_function() {
-                        name_parts.push(format!(
-                            "<locals of function '{}'>",
-                            function_def.node(&module_ast).name.as_str()
-                        ));
-                    }
-                }
-                _ => {}
-            }
-        }
-
-        if let Some(module) = file_to_module(self.db, file) {
-            let module_name = module.name(self.db);
-            name_parts.push(module_name.as_str().to_string());
-        }
-
-        name_parts.reverse();
-        name_parts
-    }
-}
-
-impl std::fmt::Display for QualifiedClassName<'_> {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        for parent in self.components_excluding_self() {
-            f.write_str(&parent)?;
-            f.write_char('.')?;
-        }
-        f.write_str(self.class.name(self.db))
-    }
-}
-
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash, get_size2::GetSize)]
 pub(super) enum InheritanceCycle {
    /// The class is cyclically defined and is a participant in the cycle.
--- a/crates/ty_python_semantic/src/types/diagnostic.rs
+++ b/crates/ty_python_semantic/src/types/diagnostic.rs
@@ -10,13 +10,12 @@ use crate::diagnostic::format_enumeration;
 use crate::lint::{Level, LintRegistryBuilder, LintStatus};
 use crate::semantic_index::definition::{Definition, DefinitionKind};
 use crate::semantic_index::place::{PlaceTable, ScopedPlaceId};
-use crate::semantic_index::{global_scope, place_table, use_def_map};
+use crate::semantic_index::{global_scope, place_table};
 use crate::suppression::FileSuppressionId;
 use crate::types::KnownInstanceType;
 use crate::types::call::CallError;
 use crate::types::class::{DisjointBase, DisjointBaseKind, Field};
-use crate::types::function::{FunctionType, KnownFunction};
-use crate::types::liskov::{MethodKind, SynthesizedMethodKind};
+use crate::types::function::KnownFunction;
 use crate::types::string_annotation::{
    BYTE_STRING_TYPE_ANNOTATION, ESCAPE_CHARACTER_IN_FORWARD_ANNOTATION, FSTRING_TYPE_ANNOTATION,
    IMPLICIT_CONCATENATED_STRING_TYPE_ANNOTATION, INVALID_SYNTAX_IN_FORWARD_ANNOTATION,
@@ -29,18 +28,15 @@ use crate::types::{
 };
 use crate::{Db, DisplaySettings, FxIndexMap, Module, ModuleName, Program, declare_lint};
 use itertools::Itertools;
-use ruff_db::{
-    diagnostic::{Annotation, Diagnostic, Span, SubDiagnostic, SubDiagnosticSeverity},
-    parsed::parsed_module,
-    source::source_text,
-};
+use ruff_db::diagnostic::{Annotation, Diagnostic, Span, SubDiagnostic, SubDiagnosticSeverity};
+use ruff_db::source::source_text;
 use ruff_python_ast::name::Name;
 use ruff_python_ast::parenthesize::parentheses_iterator;
 use ruff_python_ast::{self as ast, AnyNodeRef};
 use ruff_python_trivia::CommentRanges;
 use ruff_text_size::{Ranged, TextRange};
 use rustc_hash::FxHashSet;
-use std::fmt::{self, Formatter};
+use std::fmt::Formatter;

 /// Registers all known type check lints.
 pub(crate) fn register_lints(registry: &mut LintRegistryBuilder) {
@@ -112,7 +108,6 @@ pub(crate) fn register_lints(registry: &mut LintRegistryBuilder) {
    registry.register_lint(&REDUNDANT_CAST);
    registry.register_lint(&UNRESOLVED_GLOBAL);
    registry.register_lint(&MISSING_TYPED_DICT_KEY);
-    registry.register_lint(&INVALID_METHOD_OVERRIDE);

    // String annotations
    registry.register_lint(&BYTE_STRING_TYPE_ANNOTATION);
@@ -1939,84 +1934,6 @@ declare_lint! {
    }
 }

-declare_lint! {
-    /// ## 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.
-    ///
-    /// [Liskov Substitution Principle]: https://en.wikipedia.org/wiki/Liskov_substitution_principle
-    pub(crate) static INVALID_METHOD_OVERRIDE = {
-        summary: "detects method definitions that violate the Liskov Substitution Principle",
-        status: LintStatus::stable("0.0.1-alpha.20"),
-        default_level: Level::Error,
-    }
-}
-
 /// A collection of type check diagnostics.
 #[derive(Default, Eq, PartialEq, get_size2::GetSize)]
 pub struct TypeCheckDiagnostics {
@@ -3455,173 +3372,6 @@ pub(crate) fn report_rebound_typevar<'db>(
    }
 }

-// I tried refactoring this function to placate Clippy,
-// but it did not improve readability! -- AW.
-#[expect(clippy::too_many_arguments)]
-pub(super) fn report_invalid_method_override<'db>(
-    context: &InferContext<'db, '_>,
-    member: &str,
-    subclass: ClassType<'db>,
-    subclass_definition: Definition<'db>,
-    subclass_function: FunctionType<'db>,
-    superclass: ClassType<'db>,
-    superclass_type: Type<'db>,
-    superclass_method_kind: MethodKind,
-) {
-    let db = context.db();
-
-    let signature_span = |function: FunctionType<'db>| {
-        function
-            .literal(db)
-            .last_definition(db)
-            .spans(db)
-            .map(|spans| spans.signature)
-    };
-
-    let subclass_definition_kind = subclass_definition.kind(db);
-    let subclass_definition_signature_span = signature_span(subclass_function);
-
-    // If the function was originally defined elsewhere and simply assigned
-    // in the body of the class here, we cannot use the range associated with the `FunctionType`
-    let diagnostic_range = if subclass_definition_kind.is_function_def() {
-        subclass_definition_signature_span
-            .as_ref()
-            .and_then(Span::range)
-            .unwrap_or_else(|| {
-                subclass_function
-                    .node(db, context.file(), context.module())
-                    .range
-            })
-    } else {
-        subclass_definition.full_range(db, context.module()).range()
-    };
-
-    let class_name = subclass.name(db);
-    let superclass_name = superclass.name(db);
-
-    let overridden_method = if class_name == superclass_name {
-        format!(
-            "{superclass}.{member}",
-            superclass = superclass.class_literal(db).0.qualified_name(db),
-        )
-    } else {
-        format!("{superclass_name}.{member}")
-    };
-
-    let Some(builder) = context.report_lint(&INVALID_METHOD_OVERRIDE, diagnostic_range) else {
-        return;
-    };
-
-    let mut diagnostic =
-        builder.into_diagnostic(format_args!("Invalid override of method `{member}`"));
-
-    diagnostic.set_primary_message(format_args!(
-        "Definition is incompatible with `{overridden_method}`"
-    ));
-
-    diagnostic.info("This violates the Liskov Substitution Principle");
-
-    if !subclass_definition_kind.is_function_def()
-        && let Some(span) = subclass_definition_signature_span
-    {
-        diagnostic.annotate(
-            Annotation::secondary(span)
-                .message(format_args!("Signature of `{class_name}.{member}`")),
-        );
-    }
-
-    let superclass_scope = superclass.class_literal(db).0.body_scope(db);
-
-    match superclass_method_kind {
-        MethodKind::NotSynthesized => {
-            if let Some(superclass_symbol) = place_table(db, superclass_scope).symbol_id(member)
-                && let Some(binding) = use_def_map(db, superclass_scope)
-                    .end_of_scope_bindings(ScopedPlaceId::Symbol(superclass_symbol))
-                    .next()
-                && let Some(definition) = binding.binding.definition()
-            {
-                let definition_span = Span::from(
-                    definition
-                        .full_range(db, &parsed_module(db, superclass_scope.file(db)).load(db)),
-                );
-
-                let superclass_function_span = superclass_type
-                    .as_bound_method()
-                    .and_then(|method| signature_span(method.function(db)));
-
-                let superclass_definition_kind = definition.kind(db);
-
-                let secondary_span = if superclass_definition_kind.is_function_def()
-                    && let Some(function_span) = superclass_function_span.clone()
-                {
-                    function_span
-                } else {
-                    definition_span
-                };
-
-                diagnostic.annotate(
-                    Annotation::secondary(secondary_span.clone())
-                        .message(format_args!("`{overridden_method}` defined here")),
-                );
-
-                if !superclass_definition_kind.is_function_def()
-                    && let Some(function_span) = superclass_function_span
-                    && function_span != secondary_span
-                {
-                    diagnostic.annotate(
-                        Annotation::secondary(function_span)
-                            .message(format_args!("Signature of `{overridden_method}`")),
-                    );
-                }
-            }
-        }
-        MethodKind::Synthesized(synthesized_kind) => {
-            let make_sub =
-                |message: fmt::Arguments| SubDiagnostic::new(SubDiagnosticSeverity::Info, message);
-
-            let mut sub = match synthesized_kind {
-                SynthesizedMethodKind::Dataclass => make_sub(format_args!(
-                    "`{overridden_method}` is a generated method created because \
-                        `{superclass_name}` is a dataclass"
-                )),
-                SynthesizedMethodKind::NamedTuple => make_sub(format_args!(
-                    "`{overridden_method}` is a generated method created because \
-                        `{superclass_name}` inherits from `typing.NamedTuple`"
-                )),
-                SynthesizedMethodKind::TypedDict => make_sub(format_args!(
-                    "`{overridden_method}` is a generated method created because \
-                        `{superclass_name}` is a `TypedDict`"
-                )),
-            };
-
-            sub.annotate(
-                Annotation::primary(superclass.header_span(db))
-                    .message(format_args!("Definition of `{superclass_name}`")),
-            );
-            diagnostic.sub(sub);
-        }
-    }
-
-    if superclass.is_object(db) && matches!(member, "__eq__" | "__ne__") {
-        // Inspired by mypy's subdiagnostic at <https://github.com/python/mypy/blob/1b6ebb17b7fe64488a7b3c3b4b0187bb14fe331b/mypy/messages.py#L1307-L1318>
-        let eq_subdiagnostics = [
-            format_args!(
-                "It is recommended for `{member}` to work with arbitrary objects, for example:",
-            ),
-            format_args!(""),
-            format_args!("    def {member}(self, other: object) -> bool:",),
-            format_args!("        if not isinstance(other, {class_name}):",),
-            format_args!("            return False"),
-            format_args!("        return <logic to compare two `{class_name}` instances>"),
-            format_args!(""),
-        ];
-
-        for subdiag in eq_subdiagnostics {
-            diagnostic.help(subdiag);
-        }
-    }
-}
-
 /// This function receives an unresolved `from foo import bar` import,
 /// where `foo` can be resolved to a module but that module does not
 /// have a `bar` member or submodule.
--- a/crates/ty_python_semantic/src/types/display.rs
+++ b/crates/ty_python_semantic/src/types/display.rs
@@ -14,6 +14,8 @@ use ruff_text_size::{TextLen, TextRange, TextSize};
 use rustc_hash::{FxHashMap, FxHashSet};

 use crate::Db;
+use crate::module_resolver::file_to_module;
+use crate::semantic_index::{scope::ScopeKind, semantic_index};
 use crate::types::class::{ClassLiteral, ClassType, GenericAlias};
 use crate::types::function::{FunctionType, OverloadLiteral};
 use crate::types::generics::{GenericContext, Specialization};
@@ -25,6 +27,7 @@ use crate::types::{
    MaterializationKind, Protocol, ProtocolInstanceType, SpecialFormType, StringLiteralType,
    SubclassOfInner, Type, UnionType, WrapperDescriptorKind, visitor,
 };
+use ruff_db::parsed::parsed_module;

 /// Settings for displaying types and signatures
 #[derive(Debug, Clone, Default)]
@@ -339,11 +342,8 @@ impl<'db> AmbiguousClassCollector<'db> {
                match value {
                    AmbiguityState::Unambiguous(existing) => {
                        if *existing != class {
-                            let qualified_name_components =
-                                class.qualified_name(db).components_excluding_self();
-                            if existing.qualified_name(db).components_excluding_self()
-                                == qualified_name_components
-                            {
+                            let qualified_name_components = class.qualified_name_components(db);
+                            if existing.qualified_name_components(db) == qualified_name_components {
                                *value = AmbiguityState::RequiresFileAndLineNumber;
                            } else {
                                *value = AmbiguityState::RequiresFullyQualifiedName {
@@ -358,8 +358,7 @@ impl<'db> AmbiguousClassCollector<'db> {
                        qualified_name_components,
                    } => {
                        if *existing != class {
-                            let new_components =
-                                class.qualified_name(db).components_excluding_self();
+                            let new_components = class.qualified_name_components(db);
                            if *qualified_name_components == new_components {
                                *value = AmbiguityState::RequiresFileAndLineNumber;
                            }
@@ -506,6 +505,52 @@ impl<'db> ClassLiteral<'db> {
            settings,
        }
    }
+
+    /// Returns the components of the qualified name of this class, excluding this class itself.
+    ///
+    /// For example, calling this method on a class `C` in the module `a.b` would return
+    /// `["a", "b"]`. Calling this method on a class `D` inside the namespace of a method
+    /// `m` inside the namespace of a class `C` in the module `a.b` would return
+    /// `["a", "b", "C", "<locals of function 'm'>"]`.
+    fn qualified_name_components(self, db: &'db dyn Db) -> Vec<String> {
+        let body_scope = self.body_scope(db);
+        let file = body_scope.file(db);
+        let module_ast = parsed_module(db, file).load(db);
+        let index = semantic_index(db, file);
+        let file_scope_id = body_scope.file_scope_id(db);
+
+        let mut name_parts = vec![];
+
+        // Skips itself
+        for (_, ancestor_scope) in index.ancestor_scopes(file_scope_id).skip(1) {
+            let node = ancestor_scope.node();
+
+            match ancestor_scope.kind() {
+                ScopeKind::Class => {
+                    if let Some(class_def) = node.as_class() {
+                        name_parts.push(class_def.node(&module_ast).name.as_str().to_string());
+                    }
+                }
+                ScopeKind::Function => {
+                    if let Some(function_def) = node.as_function() {
+                        name_parts.push(format!(
+                            "<locals of function '{}'>",
+                            function_def.node(&module_ast).name.as_str()
+                        ));
+                    }
+                }
+                _ => {}
+            }
+        }
+
+        if let Some(module) = file_to_module(db, file) {
+            let module_name = module.name(db);
+            name_parts.push(module_name.as_str().to_string());
+        }
+
+        name_parts.reverse();
+        name_parts
+    }
 }

 struct ClassDisplay<'db> {
@@ -517,14 +562,14 @@ struct ClassDisplay<'db> {
 impl<'db> FmtDetailed<'db> for ClassDisplay<'db> {
    fn fmt_detailed(&self, f: &mut TypeWriter<'_, '_, 'db>) -> fmt::Result {
        let qualification_level = self.settings.qualified.get(&**self.class.name(self.db));
-
-        let ty = Type::ClassLiteral(self.class);
        if qualification_level.is_some() {
-            write!(f.with_type(ty), "{}", self.class.qualified_name(self.db))?;
-        } else {
-            write!(f.with_type(ty), "{}", self.class.name(self.db))?;
+            for parent in self.class.qualified_name_components(self.db) {
+                f.write_str(&parent)?;
+                f.write_char('.')?;
+            }
        }
-
+        f.with_type(Type::ClassLiteral(self.class))
+            .write_str(self.class.name(self.db))?;
        if qualification_level == Some(&QualificationLevel::FileAndLineNumber) {
            let file = self.class.file(self.db);
            let path = file.path(self.db);
--- a/crates/ty_python_semantic/src/types/function.rs
+++ b/crates/ty_python_semantic/src/types/function.rs
@@ -1358,8 +1358,6 @@ impl KnownFunction {
        let db = context.db();
        let parameter_types = overload.parameter_types();

-        let is_todo_type = |ty: Type<'db>| ty.is_todo();
-
        match self {
            KnownFunction::RevealType => {
                let revealed_type = overload
@@ -1393,10 +1391,7 @@ impl KnownFunction {
                let [Some(actual_ty), Some(asserted_ty)] = parameter_types else {
                    return;
                };
-                if actual_ty.is_equivalent_to(db, *asserted_ty)
-                    || any_over_type(db, *actual_ty, &is_todo_type, true)
-                    || any_over_type(db, *asserted_ty, &is_todo_type, true)
-                {
+                if actual_ty.is_equivalent_to(db, *asserted_ty) {
                    return;
                }
                if let Some(builder) = context.report_lint(&TYPE_ASSERTION_FAILURE, call_expression)
@@ -1432,9 +1427,7 @@ impl KnownFunction {
                let [Some(actual_ty)] = parameter_types else {
                    return;
                };
-                if actual_ty.is_equivalent_to(db, Type::Never)
-                    || any_over_type(db, *actual_ty, &is_todo_type, true)
-                {
+                if actual_ty.is_equivalent_to(db, Type::Never) {
                    return;
                }
                if let Some(builder) = context.report_lint(&TYPE_ASSERTION_FAILURE, call_expression)
--- a/crates/ty_python_semantic/src/types/ide_support.rs
+++ b/crates/ty_python_semantic/src/types/ide_support.rs
@@ -451,7 +451,7 @@ impl<'db> AllMembers<'db> {
 }

 /// A member of a type with an optional definition.
-#[derive(Clone, Debug, Eq, PartialEq, Hash)]
+#[derive(Clone, Debug)]
 pub struct MemberWithDefinition<'db> {
    pub member: Member<'db>,
    pub definition: Option<Definition<'db>>,
--- a/crates/ty_python_semantic/src/types/infer/builder.rs
+++ b/crates/ty_python_semantic/src/types/infer/builder.rs
@@ -108,7 +108,7 @@ use crate::types::{
    TrackedConstraintSet, Truthiness, Type, TypeAliasType, TypeAndQualifiers, TypeContext,
    TypeQualifiers, TypeVarBoundOrConstraintsEvaluation, TypeVarDefaultEvaluation, TypeVarIdentity,
    TypeVarInstance, TypeVarKind, TypeVarVariance, TypedDictType, UnionBuilder, UnionType,
-    UnionTypeInstance, binding_type, liskov, todo_type,
+    UnionTypeInstance, binding_type, todo_type,
 };
 use crate::types::{ClassBase, add_inferred_python_version_hint_to_diagnostic};
 use crate::unpack::{EvaluationMode, UnpackPosition};
@@ -548,10 +548,9 @@ impl<'db, 'ast> TypeInferenceBuilder<'db, 'ast> {
            "Inferring deferred types should not add more deferred definitions"
        );

-        if self.db().should_check_file(self.file()) {
-            self.check_class_definitions();
-            self.check_overloaded_functions(node);
-        }
+        // TODO: Only call this function when diagnostics are enabled.
+        self.check_class_definitions();
+        self.check_overloaded_functions(node);
    }

    /// Iterate over all class definitions to check that the definition will not cause an exception
@@ -950,9 +949,6 @@ impl<'db, 'ast> TypeInferenceBuilder<'db, 'ast> {
                }
            }

-            // (8) Check for Liskov violations
-            liskov::check_class(&self.context, class);
-
            if let Some(protocol) = class.into_protocol_class(self.db()) {
                protocol.validate_members(&self.context);
            }
--- a/crates/ty_python_semantic/src/types/liskov.rs
+++ b/crates/ty_python_semantic/src/types/liskov.rs
@@ -1,167 +0,0 @@
-//! Checks relating to the [Liskov Substitution Principle].
-//!
-//! [Liskov Substitution Principle]: https://en.wikipedia.org/wiki/Liskov_substitution_principle
-
-use rustc_hash::FxHashSet;
-
-use crate::{
-    place::Place,
-    semantic_index::place_table,
-    types::{
-        ClassBase, ClassLiteral, ClassType, KnownClass, Type,
-        class::CodeGeneratorKind,
-        context::InferContext,
-        diagnostic::report_invalid_method_override,
-        ide_support::{MemberWithDefinition, all_declarations_and_bindings},
-    },
-};
-
-pub(super) fn check_class<'db>(context: &InferContext<'db, '_>, class: ClassLiteral<'db>) {
-    let db = context.db();
-    if class.is_known(db, KnownClass::Object) {
-        return;
-    }
-
-    let class_specialized = class.identity_specialization(db);
-    let own_class_members: FxHashSet<_> =
-        all_declarations_and_bindings(db, class.body_scope(db)).collect();
-
-    for member in own_class_members {
-        check_class_declaration(context, class_specialized, &member);
-    }
-}
-
-fn check_class_declaration<'db>(
-    context: &InferContext<'db, '_>,
-    class: ClassType<'db>,
-    member: &MemberWithDefinition<'db>,
-) {
-    let db = context.db();
-
-    let MemberWithDefinition { member, definition } = member;
-
-    // TODO: Check Liskov on non-methods too
-    let Type::FunctionLiteral(function) = member.ty else {
-        return;
-    };
-
-    let Some(definition) = definition else {
-        return;
-    };
-
-    // TODO: classmethods and staticmethods
-    if function.is_classmethod(db) || function.is_staticmethod(db) {
-        return;
-    }
-
-    // Constructor methods are not checked for Liskov compliance
-    if matches!(
-        &*member.name,
-        "__init__" | "__new__" | "__post_init__" | "__init_subclass__"
-    ) {
-        return;
-    }
-
-    // Synthesized `__replace__` methods on dataclasses are not checked
-    if &member.name == "__replace__"
-        && matches!(
-            CodeGeneratorKind::from_class(db, class.class_literal(db).0, None),
-            Some(CodeGeneratorKind::DataclassLike(_))
-        )
-    {
-        return;
-    }
-
-    let Place::Defined(type_on_subclass_instance, _, _) =
-        Type::instance(db, class).member(db, &member.name).place
-    else {
-        return;
-    };
-
-    for superclass in class.iter_mro(db).skip(1).filter_map(ClassBase::into_class) {
-        let superclass_symbol_table =
-            place_table(db, superclass.class_literal(db).0.body_scope(db));
-
-        let mut method_kind = MethodKind::NotSynthesized;
-
-        // If the member is not defined on the class itself, skip it
-        if let Some(superclass_symbol) = superclass_symbol_table.symbol_by_name(&member.name) {
-            if !(superclass_symbol.is_bound() || superclass_symbol.is_declared()) {
-                continue;
-            }
-        } else {
-            let (superclass_literal, superclass_specialization) = superclass.class_literal(db);
-            if superclass_literal
-                .own_synthesized_member(db, superclass_specialization, None, &member.name)
-                .is_none()
-            {
-                continue;
-            }
-            let class_kind =
-                CodeGeneratorKind::from_class(db, superclass_literal, superclass_specialization);
-
-            method_kind = match class_kind {
-                Some(CodeGeneratorKind::NamedTuple) => {
-                    MethodKind::Synthesized(SynthesizedMethodKind::NamedTuple)
-                }
-                Some(CodeGeneratorKind::DataclassLike(_)) => {
-                    MethodKind::Synthesized(SynthesizedMethodKind::Dataclass)
-                }
-                // It's invalid to define a method on a `TypedDict` (and this should be
-                // reported elsewhere), but it's valid to override other things on a
-                // `TypedDict`, so this case isn't relevant right now but may become
-                // so when we expand Liskov checking in the future
-                Some(CodeGeneratorKind::TypedDict) => {
-                    MethodKind::Synthesized(SynthesizedMethodKind::TypedDict)
-                }
-                None => MethodKind::NotSynthesized,
-            };
-        }
-
-        let Place::Defined(superclass_type, _, _) = Type::instance(db, superclass)
-            .member(db, &member.name)
-            .place
-        else {
-            // If not defined on any superclass, nothing to check
-            break;
-        };
-
-        let Some(superclass_type_as_callable) = superclass_type.try_upcast_to_callable(db) else {
-            continue;
-        };
-
-        if type_on_subclass_instance.is_assignable_to(db, superclass_type_as_callable) {
-            continue;
-        }
-
-        report_invalid_method_override(
-            context,
-            &member.name,
-            class,
-            *definition,
-            function,
-            superclass,
-            superclass_type,
-            method_kind,
-        );
-
-        // Only one diagnostic should be emitted per each invalid override,
-        // even if it overrides multiple superclasses incorrectly!
-        // It's possible `report_invalid_method_override` didn't emit a diagnostic because there's a
-        // suppression comment, but that too should cause us to exit early here.
-        break;
-    }
-}
-
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub(super) enum MethodKind {
-    Synthesized(SynthesizedMethodKind),
-    NotSynthesized,
-}
-
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub(super) enum SynthesizedMethodKind {
-    NamedTuple,
-    Dataclass,
-    TypedDict,
-}
--- a/crates/ty_server/Cargo.toml
+++ b/crates/ty_server/Cargo.toml
@@ -34,6 +34,7 @@ salsa = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
 shellexpand = { workspace = true }
+smallvec = { workspace=true }
 thiserror = { workspace = true }
 tracing = { workspace = true }
 tracing-subscriber = { workspace = true, features = ["chrono"] }
@@ -43,7 +44,6 @@ dunce = { workspace = true }
 insta = { workspace = true, features = ["filters", "json"] }
 regex = { workspace = true }
 tempfile = { workspace = true }
-smallvec = { workspace=true }

 [target.'cfg(target_vendor = "apple")'.dependencies]
 libc = { workspace = true }
--- a/crates/ty_server/tests/e2e/snapshots/e2ecommandsdebug_command.snap
+++ b/crates/ty_server/tests/e2e/snapshots/e2ecommandsdebug_command.snap
@@ -58,7 +58,6 @@ Settings: Settings {
        "invalid-key": Error (Default),
        "invalid-legacy-type-variable": Error (Default),
        "invalid-metaclass": Error (Default),
-        "invalid-method-override": Error (Default),
        "invalid-named-tuple": Error (Default),
        "invalid-newtype": Error (Default),
        "invalid-overload": Error (Default),
--- a/dist-workspace.toml
+++ b/dist-workspace.toml
@@ -66,7 +66,7 @@ install-path = ["$XDG_BIN_HOME/", "$XDG_DATA_HOME/../bin", "~/.local/bin"]
 global = "depot-ubuntu-latest-4"

 [dist.github-action-commits]
-"actions/checkout" = "1af3b93b6815bc44a9784bd300feb67ff0d1eeb3" # v6.0.0
+"actions/checkout" = "ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493" # v5.0.0
 "actions/upload-artifact" = "330a01c490aca151604b8cf639adc76d48f6c5d4" # v5.0.0
 "actions/download-artifact" = "018cc2cf5baa6db3ef3c5f8a56943fffe632ef53" # v6.0.0
 "actions/attest-build-provenance" = "c074443f1aee8d4aeeae555aebba3282517141b2" #v2.2.3
--- a/docs/requirements-insiders.txt
+++ b/docs/requirements-insiders.txt
@@ -1,5 +1,5 @@
 PyYAML==6.0.3
-ruff==0.14.6
+ruff==0.14.5
 mkdocs==1.6.1
 mkdocs-material @ git+ssh://git@github.com/astral-sh/mkdocs-material-insiders.git@39da7a5e761410349e9a1b8abf593b0cdd5453ff
 mkdocs-redirects==1.2.2
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -1,5 +1,5 @@
 PyYAML==6.0.3
-ruff==0.14.6
+ruff==0.14.5
 mkdocs==1.6.1
 mkdocs-material==9.5.38
 mkdocs-redirects==1.2.2
--- a/ty.schema.json
+++ b/ty.schema.json
@@ -613,16 +613,6 @@
            }
          ]
        },
-        "invalid-method-override": {
-          "title": "detects method definitions that violate the Liskov Substitution Principle",
-          "description": "## What it does\nDetects method overrides that violate the [Liskov Substitution Principle] (\"LSP\").\n\nThe LSP states that an instance of a subtype should be substitutable for an instance of its supertype.\nApplied to Python, this means:\n1. All argument combinations a superclass method accepts\n   must also be accepted by an overriding subclass method.\n2. The return type of an overriding subclass method must be a subtype\n   of the return type of the superclass method.\n\n## Why is this bad?\nViolating the Liskov Substitution Principle will lead to many of ty's assumptions and\ninferences being incorrect, which will mean that it will fail to catch many possible\ntype errors in your code.\n\n## Example\n```python\nclass Super:\n    def method(self, x) -> int:\n        return 42\n\nclass Sub(Super):\n    # Liskov violation: `str` is not a subtype of `int`,\n    # but the supertype method promises to return an `int`.\n    def method(self, x) -> str:  # error: [invalid-override]\n        return \"foo\"\n\ndef accepts_super(s: Super) -> int:\n    return s.method(x=42)\n\naccepts_super(Sub())  # The result of this call is a string, but ty will infer\n                      # it to be an `int` due to the violation of the Liskov Substitution Principle.\n\nclass Sub2(Super):\n    # Liskov violation: the superclass method can be called with a `x=`\n    # keyword argument, but the subclass method does not accept it.\n    def method(self, y) -> int:  # error: [invalid-override]\n       return 42\n\naccepts_super(Sub2())  # TypeError at runtime: method() got an unexpected keyword argument 'x'\n                       # ty cannot catch this error due to the violation of the Liskov Substitution Principle.\n```\n\n## Common issues\n\n### Why does ty complain about my `__eq__` method?\n\n`__eq__` and `__ne__` methods in Python are generally expected to accept arbitrary\nobjects as their second argument, for example:\n\n```python\nclass A:\n    x: int\n\n    def __eq__(self, other: object) -> bool:\n        # gracefully handle an object of an unexpected type\n        # without raising an exception\n        if not isinstance(other, A):\n            return False\n        return self.x == other.x\n```\n\nIf `A.__eq__` here were annotated as only accepting `A` instances for its second argument,\nit would imply that you wouldn't be able to use `==` between instances of `A` and\ninstances of unrelated classes without an exception possibly being raised. While some\nclasses in Python do indeed behave this way, the strongly held convention is that it should\nbe avoided wherever possible. As part of this check, therefore, ty enforces that `__eq__`\nand `__ne__` methods accept `object` as their second argument.\n\n[Liskov Substitution Principle]: https://en.wikipedia.org/wiki/Liskov_substitution_principle",
-          "default": "error",
-          "oneOf": [
-            {
-              "$ref": "#/definitions/Level"
-            }
-          ]
-        },
        "invalid-named-tuple": {
          "title": "detects invalid `NamedTuple` class definitions",
          "description": "## What it does\nChecks for invalidly defined `NamedTuple` classes.\n\n## Why is this bad?\nAn invalidly defined `NamedTuple` class may lead to the type checker\ndrawing incorrect conclusions. It may also lead to `TypeError`s at runtime.\n\n## Examples\nA class definition cannot combine `NamedTuple` with other base classes\nin multiple inheritance; doing so raises a `TypeError` at runtime. The sole\nexception to this rule is `Generic[]`, which can be used alongside `NamedTuple`\nin a class's bases list.\n\n```pycon\n>>> from typing import NamedTuple\n>>> class Foo(NamedTuple, object): ...\nTypeError: can only inherit from a NamedTuple type and Generic\n```",