[ty] Generic "manual" PEP 695 type aliases

.claude/settings.local.json

@@ -1,67 +0,0 @@
-{
-  "permissions": {
-    "allow": [
-      "Bash(cargo build:*)",
-      "Read(//home/micha/astral/discord.py/discord/**)",
-      "Bash(source:*)",
-      "Bash(./target/profiling/ty check:*)",
-      "Bash(tee:*)",
-      "Read(//home/micha/astral/discord.py/.venv/**)",
-      "Read(//home/micha/astral/discord.py/**)",
-      "Bash(perf record:*)",
-      "Bash(perf report:*)",
-      "Bash(time:*)",
-      "Bash(../ruff/target/profiling/ty check discord/audit_logs.py -vv)",
-      "Bash(sed:*)",
-      "Read(//home/micha/git/TypeScript/**)",
-      "Bash(cargo test:*)",
-      "Bash(MDTEST_TEST_FILTER='union_types.md - Union types - Unions of tuples' cargo test -p ty_python_semantic --test mdtest -- mdtest__union_types)",
-      "Bash(timeout 10 cargo test --package ty_python_semantic --lib types::tests::divergent_type)",
-      "Bash(timeout 30 cargo test:*)",
-      "Bash(git stash:*)",
-      "Bash(timeout 60 time:*)",
-      "Bash(for i in 1 2 3 4 5)",
-      "Bash(do echo \"Run $i:\")",
-      "Bash(done)",
-      "Bash(for i in 1 2 3)",
-      "Bash(cargo fuzz run:*)",
-      "Bash(timeout 60 cargo fuzz run -s none ty_check_invalid_syntax -- -timeout=1)",
-      "Bash(for:*)",
-      "Bash(do echo \"=== Checking $crash ===\")",
-      "Bash(uvx ty@latest check \"$crash\")",
-      "Bash(do echo \"=== $crash ===\")",
-      "Bash(while read crash)",
-      "Bash(cargo fuzz cmin:*)",
-      "Bash(cargo +nightly fuzz cmin:*)",
-      "Bash(timeout 120 cargo fuzz run -s none ty_check_invalid_syntax -- -timeout=1)",
-      "Bash(awk:*)",
-      "Bash(while read file)",
-      "Bash(cat:*)",
-      "Bash(uvx ty@latest:*)",
-      "Bash(do cp \"$crash\" /tmp/isolated_crash.py)",
-      "Bash(echo \"=== $crash ===\")",
-      "Bash(do echo \"=== test$i.py ===\")",
-      "Bash(do echo \"=== Testing $crash ===\")",
-      "Bash(tree:*)",
-      "Bash(cut:*)",
-      "Bash(grep:*)",
-      "Bash(ls:*)",
-      "Bash(xargs basename:*)",
-      "Bash(wc:*)",
-      "Bash(find:*)",
-      "Bash({} ;)",
-      "Bash(git checkout:*)",
-      "Bash(do)",
-      "Bash(if ! grep -q \"use crate::types\" \"$f\")",
-      "Bash(! grep -q \"crate::types::\" \"$f\")",
-      "Bash(then)",
-      "Bash(else)",
-      "Bash(fi)",
-      "Bash(1)",
-      "Bash(__NEW_LINE__ echo \"Done\")",
-      "Bash(rm:*)"
-    ],
-    "deny": [],
-    "ask": []
-  }
-}

.gitattributes

@@ -22,7 +22,6 @@ crates/ruff_linter/resources/test/fixtures/pyupgrade/UP018_CR.py text eol=cr
 crates/ruff_linter/resources/test/fixtures/pyupgrade/UP018_LF.py text eol=lf
 
 crates/ruff_python_parser/resources/inline linguist-generated=true
-crates/ty_python_semantic/resources/mdtest/external/*.lock linguist-generated=true
 
 ruff.schema.json -diff linguist-generated=true text=auto eol=lf
 ty.schema.json -diff linguist-generated=true text=auto eol=lf

.github/actionlint.yaml

@@ -4,12 +4,10 @@
 self-hosted-runner:
   # Various runners we use that aren't recognized out-of-the-box by actionlint:
   labels:
-    - depot-ubuntu-24.04-4
     - depot-ubuntu-latest-8
     - depot-ubuntu-22.04-16
     - depot-ubuntu-22.04-32
     - depot-windows-2022-16
-    - depot-ubuntu-22.04-arm-4
     - github-windows-2025-x86_64-8
     - github-windows-2025-x86_64-16
     - codspeed-macro

.github/workflows/ci.yaml

@@ -952,7 +952,7 @@ jobs:
           tool: cargo-codspeed
 
       - name: "Build benchmarks"
-        run: cargo codspeed build --features "codspeed,ruff_instrumented" --profile profiling --no-default-features -p ruff_benchmark --bench formatter --bench lexer --bench linter --bench parser
+        run: cargo codspeed build --features "codspeed,instrumented" --profile profiling --no-default-features -p ruff_benchmark --bench formatter --bench lexer --bench linter --bench parser
 
       - name: "Run benchmarks"
         uses: CodSpeedHQ/action@346a2d8a8d9d38909abd0bc3d23f773110f076ad # v4.4.1
@@ -960,9 +960,9 @@ jobs:
           mode: simulation
           run: cargo codspeed run
 
-  benchmarks-instrumented-ty-build:
-    name: "benchmarks instrumented ty (build)"
-    runs-on: depot-ubuntu-24.04-4
+  benchmarks-instrumented-ty:
+    name: "benchmarks instrumented (ty)"
+    runs-on: ubuntu-24.04
     needs: determine_changes
     if: |
       github.repository == 'astral-sh/ruff' &&
@@ -971,6 +971,9 @@ jobs:
         needs.determine_changes.outputs.ty == 'true'
       )
     timeout-minutes: 20
+    permissions:
+      contents: read # required for actions/checkout
+      id-token: write # required for OIDC authentication with CodSpeed
     steps:
       - name: "Checkout Branch"
         uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
@@ -980,6 +983,7 @@ jobs:
       - uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
         with:
           save-if: ${{ github.ref == 'refs/heads/main' }}
+      - uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # v7.1.4
 
       - name: "Install Rust toolchain"
         run: rustup show
@@ -990,64 +994,28 @@ jobs:
           tool: cargo-codspeed
 
       - name: "Build benchmarks"
-        run: cargo codspeed build -m instrumentation --features "codspeed,ty_instrumented" --profile profiling --no-default-features -p ruff_benchmark --bench ty
-
-      - name: "Upload benchmark binary"
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
-        with:
-          name: benchmarks-instrumented-ty-binary
-          path: target/codspeed/simulation/ruff_benchmark
-          retention-days: 1
-
-  benchmarks-instrumented-ty-run:
-    name: "benchmarks instrumented ty (${{ matrix.benchmark }})"
-    runs-on: ubuntu-24.04
-    needs: benchmarks-instrumented-ty-build
-    timeout-minutes: 20
-    permissions:
-      contents: read # required for actions/checkout
-      id-token: write # required for OIDC authentication with CodSpeed
-    strategy:
-      fail-fast: false
-      matrix:
-        benchmark:
-          - "check_file|micro|anyio"
-          - "attrs|hydra|datetype"
-    steps:
-      - name: "Checkout Branch"
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
-        with:
-          persist-credentials: false
-      - uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # v7.1.4
-
-      - name: "Install codspeed"
-        uses: taiki-e/install-action@3575e532701a5fc614b0c842e4119af4cc5fd16d # v2.62.60
-        with:
-          tool: cargo-codspeed
-
-      - name: "Download benchmark binary"
-        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v4.3.0
-        with:
-          name: benchmarks-instrumented-ty-binary
-          path: target/codspeed/simulation/ruff_benchmark
-
-      - name: "Restore binary permissions"
-        run: chmod +x target/codspeed/simulation/ruff_benchmark/ty
+        run: cargo codspeed build --features "codspeed,instrumented" --profile profiling --no-default-features -p ruff_benchmark --bench ty
 
       - name: "Run benchmarks"
         uses: CodSpeedHQ/action@346a2d8a8d9d38909abd0bc3d23f773110f076ad # v4.4.1
         with:
           mode: simulation
-          run: cargo codspeed run --bench ty "${{ matrix.benchmark }}"
+          run: cargo codspeed run
 
-  benchmarks-walltime-build:
-    name: "benchmarks walltime (build)"
-    # We only run this job if `github.repository == 'astral-sh/ruff'`,
-    # so hardcoding depot here is fine
-    runs-on: depot-ubuntu-22.04-arm-4
+  benchmarks-walltime:
+    name: "benchmarks walltime (${{ matrix.benchmarks }})"
+    runs-on: codspeed-macro
     needs: determine_changes
     if: ${{ github.repository == 'astral-sh/ruff' && !contains(github.event.pull_request.labels.*.name, 'no-test') && (needs.determine_changes.outputs.ty == 'true' || github.ref == 'refs/heads/main') }}
     timeout-minutes: 20
+    permissions:
+      contents: read # required for actions/checkout
+      id-token: write # required for OIDC authentication with CodSpeed
+    strategy:
+      matrix:
+        benchmarks:
+          - "medium|multithreaded"
+          - "small|large"
     steps:
       - name: "Checkout Branch"
         uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
@@ -1068,51 +1036,7 @@ jobs:
           tool: cargo-codspeed
 
       - name: "Build benchmarks"
-        run: cargo codspeed build -m walltime --features "codspeed,ty_walltime" --profile profiling --no-default-features -p ruff_benchmark
-
-      - name: "Upload benchmark binary"
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
-        with:
-          name: benchmarks-walltime-binary
-          path: target/codspeed/walltime/ruff_benchmark
-          retention-days: 1
-
-  benchmarks-walltime-run:
-    name: "benchmarks walltime (${{ matrix.benchmark }})"
-    runs-on: codspeed-macro
-    needs: benchmarks-walltime-build
-    timeout-minutes: 20
-    permissions:
-      contents: read # required for actions/checkout
-      id-token: write # required for OIDC authentication with CodSpeed
-    strategy:
-      matrix:
-        benchmark:
-          - colour_science
-          - "pandas|tanjun|altair"
-          - "static_frame|sympy"
-          - "pydantic|multithreaded|freqtrade"
-    steps:
-      - name: "Checkout Branch"
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
-        with:
-          persist-credentials: false
-
-      - uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # v7.1.4
-
-      - name: "Install codspeed"
-        uses: taiki-e/install-action@3575e532701a5fc614b0c842e4119af4cc5fd16d # v2.62.60
-        with:
-          tool: cargo-codspeed
-
-      - name: "Download benchmark binary"
-        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
-        with:
-          name: benchmarks-walltime-binary
-          path: target/codspeed/walltime/ruff_benchmark
-
-      - name: "Restore binary permissions"
-        run: chmod +x target/codspeed/walltime/ruff_benchmark/ty_walltime
+        run: cargo codspeed build --features "codspeed,walltime" --profile profiling --no-default-features -p ruff_benchmark
 
       - name: "Run benchmarks"
         uses: CodSpeedHQ/action@346a2d8a8d9d38909abd0bc3d23f773110f076ad # v4.4.1
@@ -1123,4 +1047,4 @@ jobs:
           CODSPEED_PERF_ENABLED: false
         with:
           mode: walltime
-          run: cargo codspeed run --bench ty_walltime -m walltime "${{ matrix.benchmark }}"
+          run: cargo codspeed run --bench ty_walltime "${{ matrix.benchmarks }}"

.github/workflows/daily_fuzz.yaml

@@ -62,7 +62,7 @@ jobs:
     name: Create an issue if the daily fuzz surfaced any bugs
     runs-on: ubuntu-latest
     needs: fuzz
-    if: ${{ github.repository == 'astral-sh/ruff' && always() && github.event_name == 'schedule' && needs.fuzz.result != 'success' }}
+    if: ${{ github.repository == 'astral-sh/ruff' && always() && github.event_name == 'schedule' && needs.fuzz.result == 'failure' }}
     permissions:
       issues: write
     steps:

.github/workflows/mypy_primer.yaml

@@ -6,11 +6,6 @@ on:
   pull_request:
     paths:
       - "crates/ty*/**"
-      - "!crates/ty_ide/**"
-      - "!crates/ty_server/**"
-      - "!crates/ty_test/**"
-      - "!crates/ty_completion_eval/**"
-      - "!crates/ty_wasm/**"
       - "crates/ruff_db"
       - "crates/ruff_python_ast"
       - "crates/ruff_python_parser"

.github/workflows/sync_typeshed.yaml

@@ -16,7 +16,8 @@ name: Sync typeshed
 # 3. Once the Windows worker is done, a MacOS worker:
 #    a. Checks out the branch created by the Linux worker
 #    b. Syncs all docstrings available on MacOS that are not available on Linux or Windows
-#    c. Formats the code again
+#    c. Attempts to update any snapshots that might have changed
+#       (this sub-step is allowed to fail)
 #    d. Commits the changes and pushes them to the same upstream branch
 #    e. Creates a PR against the `main` branch using the branch all three workers have pushed to
 # 4. If any of steps 1-3 failed, an issue is created in the `astral-sh/ruff` repository
@@ -197,6 +198,42 @@ jobs:
         run: |
           rm "${VENDORED_TYPESHED}/pyproject.toml"
           git commit -am "Remove pyproject.toml file"
+      - uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
+      - name: "Install Rust toolchain"
+        if: ${{ success() }}
+        run: rustup show
+      - name: "Install mold"
+        if: ${{ success() }}
+        uses: rui314/setup-mold@725a8794d15fc7563f59595bd9556495c0564878 # v1
+      - name: "Install cargo nextest"
+        if: ${{ success() }}
+        uses: taiki-e/install-action@3575e532701a5fc614b0c842e4119af4cc5fd16d # v2.62.60
+        with:
+          tool: cargo-nextest
+      - name: "Install cargo insta"
+        if: ${{ success() }}
+        uses: taiki-e/install-action@3575e532701a5fc614b0c842e4119af4cc5fd16d # v2.62.60
+        with:
+          tool: cargo-insta
+      - name: Update snapshots
+        if: ${{ success() }}
+        run: |
+          cargo r \
+          --profile=profiling \
+          -p ty_completion_eval \
+          -- all --tasks ./crates/ty_completion_eval/completion-evaluation-tasks.csv
+
+          # The `cargo insta` docs indicate that `--unreferenced=delete` might be a good option,
+          # but from local testing it appears to just revert all changes made by `cargo insta test --accept`.
+          #
+          # If there were only snapshot-related failures, `cargo insta test --accept` will have exit code 0,
+          # but if there were also other mdtest failures (for example), it will return a nonzero exit code.
+          # We don't care about other tests failing here, we just want snapshots updated where possible,
+          # so we use `|| true` here to ignore the exit code.
+          cargo insta test --accept --color=always --all-features --test-runner=nextest || true
+      - name: Commit snapshot changes
+        if: ${{ success() }}
+        run: git commit -am "Update snapshots" || echo "No snapshot changes to commit"
       - name: Push changes upstream and create a PR
         if: ${{ success() }}
         run: |
@@ -208,7 +245,7 @@ jobs:
     name: Create an issue if the typeshed sync failed
     runs-on: ubuntu-latest
     needs: [sync, docstrings-windows, docstrings-macos-and-pr]
-    if: ${{ github.repository == 'astral-sh/ruff' && always() && github.event_name == 'schedule' && (needs.sync.result != 'success' || needs.docstrings-windows.result != 'success' || needs.docstrings-macos-and-pr.result != 'success') }}
+    if: ${{ github.repository == 'astral-sh/ruff' && always() && github.event_name == 'schedule' && (needs.sync.result == 'failure' || needs.docstrings-windows.result == 'failure' || needs.docstrings-macos-and-pr.result == 'failure') }}
     permissions:
       issues: write
     steps:

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

@@ -17,6 +17,7 @@ env:
   RUSTUP_MAX_RETRIES: 10
   RUST_BACKTRACE: 1
   REF_NAME: ${{ github.ref_name }}
+  CF_API_TOKEN_EXISTS: ${{ secrets.CF_API_TOKEN != '' }}
 
 jobs:
   ty-ecosystem-analyzer:
@@ -111,13 +112,22 @@ jobs:
 
           cat diff-statistics.md >> "$GITHUB_STEP_SUMMARY"
 
-      # NOTE: astral-sh-bot uses this artifact to post comments on PRs.
-      # Make sure to update the bot if you rename the artifact.
-      - name: "Upload full report"
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+      - name: "Deploy to Cloudflare Pages"
+        if: ${{ env.CF_API_TOKEN_EXISTS == 'true' }}
+        id: deploy
+        uses: cloudflare/wrangler-action@da0e0dfe58b7a431659754fdf3f186c529afbe65 # v3.14.1
         with:
-          name: full-report
-          path: dist/
+          apiToken: ${{ secrets.CF_API_TOKEN }}
+          accountId: ${{ secrets.CF_ACCOUNT_ID }}
+          command: pages deploy dist --project-name=ty-ecosystem --branch ${{ github.head_ref }} --commit-hash ${GITHUB_SHA}
+
+      - name: "Append deployment URL"
+        if: ${{ env.CF_API_TOKEN_EXISTS == 'true' }}
+        env:
+          DEPLOYMENT_URL: ${{ steps.deploy.outputs.pages-deployment-alias-url }}
+        run: |
+          echo >> comment.md
+          echo "**[Full report with detailed diff]($DEPLOYMENT_URL/diff)** ([timing results]($DEPLOYMENT_URL/timing))" >> comment.md
 
       # NOTE: astral-sh-bot uses this artifact to post comments on PRs.
       # Make sure to update the bot if you rename the artifact.

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

@@ -14,6 +14,7 @@ env:
   CARGO_TERM_COLOR: always
   RUSTUP_MAX_RETRIES: 10
   RUST_BACKTRACE: 1
+  CF_API_TOKEN_EXISTS: ${{ secrets.CF_API_TOKEN != '' }}
 
 jobs:
   ty-ecosystem-report:
@@ -30,12 +31,12 @@ jobs:
       - name: Install the latest version of uv
         uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # v7.1.4
         with:
-          enable-cache: true
+          enable-cache: true # zizmor: ignore[cache-poisoning] acceptable risk for CloudFlare pages artifact
 
       - uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
         with:
           workspaces: "ruff"
-          lookup-only: false
+          lookup-only: false # zizmor: ignore[cache-poisoning] acceptable risk for CloudFlare pages artifact
 
       - name: Install Rust toolchain
         run: rustup show
@@ -69,10 +70,11 @@ jobs:
             ecosystem-diagnostics.json \
             --output dist/index.html
 
-      # NOTE: astral-sh-bot uses this artifact to publish the ecosystem report.
-      # Make sure to update the bot if you rename the artifact.
-      - name: "Upload ecosystem report"
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+      - name: "Deploy to Cloudflare Pages"
+        if: ${{ env.CF_API_TOKEN_EXISTS == 'true' }}
+        id: deploy
+        uses: cloudflare/wrangler-action@da0e0dfe58b7a431659754fdf3f186c529afbe65 # v3.14.1
         with:
-          name: full-report
-          path: dist/
+          apiToken: ${{ secrets.CF_API_TOKEN }}
+          accountId: ${{ secrets.CF_ACCOUNT_ID }}
+          command: pages deploy dist --project-name=ty-ecosystem --branch main --commit-hash ${GITHUB_SHA}

.github/workflows/typing_conformance.yaml

@@ -6,11 +6,6 @@ on:
   pull_request:
     paths:
       - "crates/ty*/**"
-      - "!crates/ty_ide/**"
-      - "!crates/ty_server/**"
-      - "!crates/ty_test/**"
-      - "!crates/ty_completion_eval/**"
-      - "!crates/ty_wasm/**"
       - "crates/ruff_db"
       - "crates/ruff_python_ast"
       - "crates/ruff_python_parser"

.pre-commit-config.yaml

@@ -5,7 +5,7 @@ exclude: |
     .github/workflows/release.yml|
     crates/ty_vendored/vendor/.*|
     crates/ty_project/resources/.*|
-    crates/ty_python_types/resources/corpus/.*|
+    crates/ty_python_semantic/resources/corpus/.*|
     crates/ty/docs/(configuration|rules|cli|environment).md|
     crates/ruff_benchmark/resources/.*|
     crates/ruff_linter/resources/.*|

Cargo.lock

@@ -3083,7 +3083,6 @@ dependencies = [
  "ty",
  "ty_project",
  "ty_python_semantic",
- "ty_python_types",
  "ty_static",
  "url",
 ]
@@ -3130,9 +3129,7 @@ dependencies = [
  "salsa",
  "schemars",
  "serde",
- "ty_module_resolver",
  "ty_python_semantic",
- "ty_python_types",
  "zip",
 ]
 
@@ -3622,8 +3619,8 @@ checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
 
 [[package]]
 name = "salsa"
-version = "0.25.2"
-source = "git+https://github.com/salsa-rs/salsa.git?rev=ce80691fa0b87dc2fd2235a26544e63e5e43d8d3#ce80691fa0b87dc2fd2235a26544e63e5e43d8d3"
+version = "0.24.0"
+source = "git+https://github.com/salsa-rs/salsa.git?rev=55e5e7d32fa3fc189276f35bb04c9438f9aedbd1#55e5e7d32fa3fc189276f35bb04c9438f9aedbd1"
 dependencies = [
  "boxcar",
  "compact_str",
@@ -3647,13 +3644,13 @@ dependencies = [
 
 [[package]]
 name = "salsa-macro-rules"
-version = "0.25.2"
-source = "git+https://github.com/salsa-rs/salsa.git?rev=ce80691fa0b87dc2fd2235a26544e63e5e43d8d3#ce80691fa0b87dc2fd2235a26544e63e5e43d8d3"
+version = "0.24.0"
+source = "git+https://github.com/salsa-rs/salsa.git?rev=55e5e7d32fa3fc189276f35bb04c9438f9aedbd1#55e5e7d32fa3fc189276f35bb04c9438f9aedbd1"
 
 [[package]]
 name = "salsa-macros"
-version = "0.25.2"
-source = "git+https://github.com/salsa-rs/salsa.git?rev=ce80691fa0b87dc2fd2235a26544e63e5e43d8d3#ce80691fa0b87dc2fd2235a26544e63e5e43d8d3"
+version = "0.24.0"
+source = "git+https://github.com/salsa-rs/salsa.git?rev=55e5e7d32fa3fc189276f35bb04c9438f9aedbd1#55e5e7d32fa3fc189276f35bb04c9438f9aedbd1"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4378,7 +4375,6 @@ dependencies = [
  "tracing-flame",
  "tracing-subscriber",
  "ty_combine",
- "ty_module_resolver",
  "ty_project",
  "ty_python_semantic",
  "ty_server",
@@ -4393,6 +4389,7 @@ dependencies = [
  "ordermap",
  "ruff_db",
  "ruff_python_ast",
+ "ty_python_semantic",
 ]
 
 [[package]]
@@ -4410,8 +4407,8 @@ dependencies = [
  "tempfile",
  "toml",
  "ty_ide",
- "ty_module_resolver",
  "ty_project",
+ "ty_python_semantic",
  "walkdir",
 ]
 
@@ -4441,33 +4438,8 @@ dependencies = [
  "salsa",
  "smallvec",
  "tracing",
- "ty_module_resolver",
  "ty_project",
  "ty_python_semantic",
- "ty_python_types",
- "ty_vendored",
-]
-
-[[package]]
-name = "ty_module_resolver"
-version = "0.0.0"
-dependencies = [
- "anyhow",
- "camino",
- "compact_str",
- "get-size2",
- "insta",
- "ruff_db",
- "ruff_memory_usage",
- "ruff_python_ast",
- "ruff_python_stdlib",
- "rustc-hash",
- "salsa",
- "strum",
- "strum_macros",
- "tempfile",
- "thiserror 2.0.17",
- "tracing",
  "ty_vendored",
 ]
 
@@ -4505,9 +4477,7 @@ dependencies = [
  "toml",
  "tracing",
  "ty_combine",
- "ty_module_resolver",
  "ty_python_semantic",
- "ty_python_types",
  "ty_static",
  "ty_vendored",
 ]
@@ -4521,12 +4491,19 @@ dependencies = [
  "bitvec",
  "camino",
  "colored 3.0.0",
+ "compact_str",
+ "datatest-stable",
+ "drop_bomb",
  "get-size2",
+ "glob",
  "hashbrown 0.16.1",
  "indexmap",
+ "indoc",
  "insta",
  "itertools 0.14.0",
+ "memchr",
  "ordermap",
+ "pretty_assertions",
  "quickcheck",
  "quickcheck_macros",
  "ruff_annotate_snippets",
@@ -4536,7 +4513,9 @@ dependencies = [
  "ruff_macros",
  "ruff_memory_usage",
  "ruff_python_ast",
+ "ruff_python_literal",
  "ruff_python_parser",
+ "ruff_python_stdlib",
  "ruff_python_trivia",
  "ruff_source_file",
  "ruff_text_size",
@@ -4550,57 +4529,10 @@ dependencies = [
  "strsim",
  "strum",
  "strum_macros",
+ "tempfile",
+ "test-case",
  "thiserror 2.0.17",
  "tracing",
- "ty_combine",
- "ty_module_resolver",
- "ty_static",
- "ty_vendored",
-]
-
-[[package]]
-name = "ty_python_types"
-version = "0.0.0"
-dependencies = [
- "anyhow",
- "bitflags 2.10.0",
- "camino",
- "compact_str",
- "datatest-stable",
- "drop_bomb",
- "get-size2",
- "glob",
- "indexmap",
- "indoc",
- "insta",
- "itertools 0.14.0",
- "memchr",
- "ordermap",
- "pretty_assertions",
- "quickcheck",
- "quickcheck_macros",
- "ruff_db",
- "ruff_diagnostics",
- "ruff_macros",
- "ruff_memory_usage",
- "ruff_python_ast",
- "ruff_python_literal",
- "ruff_python_parser",
- "ruff_python_stdlib",
- "ruff_source_file",
- "ruff_text_size",
- "rustc-hash",
- "salsa",
- "schemars",
- "serde",
- "serde_json",
- "smallvec",
- "static_assertions",
- "strum",
- "strum_macros",
- "test-case",
- "tracing",
- "ty_module_resolver",
  "ty_python_semantic",
  "ty_static",
  "ty_test",
@@ -4640,7 +4572,6 @@ dependencies = [
  "tracing-subscriber",
  "ty_combine",
  "ty_ide",
- "ty_module_resolver",
  "ty_project",
  "ty_python_semantic",
 ]
@@ -4681,9 +4612,7 @@ dependencies = [
  "thiserror 2.0.17",
  "toml",
  "tracing",
- "ty_module_resolver",
  "ty_python_semantic",
- "ty_python_types",
  "ty_static",
  "ty_vendored",
 ]

Cargo.toml

@@ -45,10 +45,8 @@ ty = { path = "crates/ty" }
 ty_combine = { path = "crates/ty_combine" }
 ty_completion_eval = { path = "crates/ty_completion_eval" }
 ty_ide = { path = "crates/ty_ide" }
-ty_module_resolver = { path = "crates/ty_module_resolver" }
 ty_project = { path = "crates/ty_project", default-features = false }
 ty_python_semantic = { path = "crates/ty_python_semantic" }
-ty_python_types = { path = "crates/ty_python_types" }
 ty_server = { path = "crates/ty_server" }
 ty_static = { path = "crates/ty_static" }
 ty_test = { path = "crates/ty_test" }
@@ -148,7 +146,7 @@ regex-automata = { version = "0.4.9" }
 rustc-hash = { version = "2.0.0" }
 rustc-stable-hash = { version = "0.1.2" }
 # When updating salsa, make sure to also update the revision in `fuzz/Cargo.toml`
-salsa = { git = "https://github.com/salsa-rs/salsa.git", rev = "ce80691fa0b87dc2fd2235a26544e63e5e43d8d3", default-features = false, features = [
+salsa = { git = "https://github.com/salsa-rs/salsa.git", rev = "55e5e7d32fa3fc189276f35bb04c9438f9aedbd1", default-features = false, features = [
     "compact_str",
     "macros",
     "salsa_unstable",

crates/ruff/tests/cli/snapshots/cli__format__output_format_github.snap

@@ -14,6 +14,6 @@ info:
 success: false
 exit_code: 1
 ----- stdout -----
-::error title=Ruff (unformatted),file=[TMP]/input.py,line=1,endLine=2::input.py:1:1: unformatted: File would be reformatted
+::error title=Ruff (unformatted),file=[TMP]/input.py,line=1,col=1,endLine=2,endColumn=1::input.py:1:1: unformatted: File would be reformatted
 
 ----- stderr -----

crates/ruff_benchmark/Cargo.toml

@@ -19,32 +19,32 @@ doctest = false
 [[bench]]
 name = "linter"
 harness = false
-required-features = ["ruff_instrumented"]
+required-features = ["instrumented"]
 
 [[bench]]
 name = "lexer"
 harness = false
-required-features = ["ruff_instrumented"]
+required-features = ["instrumented"]
 
 [[bench]]
 name = "parser"
 harness = false
-required-features = ["ruff_instrumented"]
+required-features = ["instrumented"]
 
 [[bench]]
 name = "formatter"
 harness = false
-required-features = ["ruff_instrumented"]
+required-features = ["instrumented"]
 
 [[bench]]
 name = "ty"
 harness = false
-required-features = ["ty_instrumented"]
+required-features = ["instrumented"]
 
 [[bench]]
 name = "ty_walltime"
 harness = false
-required-features = ["ty_walltime"]
+required-features = ["walltime"]
 
 [dependencies]
 ruff_db = { workspace = true, features = ["testing"] }
@@ -67,32 +67,25 @@ tracing = { workspace = true }
 workspace = true
 
 [features]
-default = ["ty_instrumented", "ty_walltime", "ruff_instrumented"]
-# Enables the ruff instrumented benchmarks
-ruff_instrumented = [
+default = ["instrumented", "walltime"]
+# Enables the benchmark that should only run with codspeed's instrumented runner
+instrumented = [
     "criterion",
     "ruff_linter",
     "ruff_python_formatter",
     "ruff_python_parser",
     "ruff_python_trivia",
-    "mimalloc",
-    "tikv-jemallocator",
-]
-# Enables the ty instrumented benchmarks
-ty_instrumented = [
-    "criterion",
     "ty_project",
-    "ruff_python_trivia",
 ]
 codspeed = ["codspeed-criterion-compat"]
-# Enables the ty_walltime benchmarks
-ty_walltime = ["ruff_db/os", "ty_project", "divan"]
+# Enables benchmark that should only run with codspeed's walltime runner.
+walltime = ["ruff_db/os", "ty_project", "divan"]
 
-[target.'cfg(target_os = "windows")'.dependencies]
-mimalloc = { workspace = true, optional = true }
+[target.'cfg(target_os = "windows")'.dev-dependencies]
+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")))'.dependencies]
-tikv-jemallocator = { workspace = true, optional = 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 }

crates/ruff_benchmark/benches/ty_walltime.rs

@@ -194,7 +194,7 @@ static SYMPY: Benchmark = Benchmark::new(
         max_dep_date: "2025-06-17",
         python_version: PythonVersion::PY312,
     },
-    13106,
+    13100,
 );
 
 static TANJUN: Benchmark = Benchmark::new(
@@ -235,55 +235,30 @@ fn run_single_threaded(bencher: Bencher, benchmark: &Benchmark) {
         });
 }
 
-#[bench(sample_size = 2, sample_count = 3)]
-fn altair(bencher: Bencher) {
-    run_single_threaded(bencher, &ALTAIR);
+#[bench(args=[&ALTAIR, &FREQTRADE, &TANJUN], sample_size=2, sample_count=3)]
+fn small(bencher: Bencher, benchmark: &Benchmark) {
+    run_single_threaded(bencher, benchmark);
 }
 
-#[bench(sample_size = 2, sample_count = 3)]
-fn freqtrade(bencher: Bencher) {
-    run_single_threaded(bencher, &FREQTRADE);
+#[bench(args=[&COLOUR_SCIENCE, &PANDAS, &STATIC_FRAME], sample_size=1, sample_count=3)]
+fn medium(bencher: Bencher, benchmark: &Benchmark) {
+    run_single_threaded(bencher, benchmark);
 }
 
-#[bench(sample_size = 2, sample_count = 3)]
-fn tanjun(bencher: Bencher) {
-    run_single_threaded(bencher, &TANJUN);
+#[bench(args=[&SYMPY, &PYDANTIC], sample_size=1, sample_count=2)]
+fn large(bencher: Bencher, benchmark: &Benchmark) {
+    run_single_threaded(bencher, benchmark);
 }
 
-#[bench(sample_size = 2, sample_count = 3)]
-fn pydantic(bencher: Bencher) {
-    run_single_threaded(bencher, &PYDANTIC);
-}
-
-#[bench(sample_size = 1, sample_count = 3)]
-fn static_frame(bencher: Bencher) {
-    run_single_threaded(bencher, &STATIC_FRAME);
-}
-
-#[bench(sample_size = 1, sample_count = 2)]
-fn colour_science(bencher: Bencher) {
-    run_single_threaded(bencher, &COLOUR_SCIENCE);
-}
-
-#[bench(sample_size = 1, sample_count = 2)]
-fn pandas(bencher: Bencher) {
-    run_single_threaded(bencher, &PANDAS);
-}
-
-#[bench(sample_size = 1, sample_count = 2)]
-fn sympy(bencher: Bencher) {
-    run_single_threaded(bencher, &SYMPY);
-}
-
-#[bench(sample_size = 3, sample_count = 8)]
-fn multithreaded(bencher: Bencher) {
+#[bench(args=[&ALTAIR], sample_size=3, sample_count=8)]
+fn multithreaded(bencher: Bencher, benchmark: &Benchmark) {
     let thread_pool = ThreadPoolBuilder::new().build().unwrap();
 
     bencher
-        .with_inputs(|| ALTAIR.setup_iteration())
+        .with_inputs(|| benchmark.setup_iteration())
         .bench_local_values(|db| {
             thread_pool.install(|| {
-                check_project(&db, ALTAIR.project.name, ALTAIR.max_diagnostics);
+                check_project(&db, benchmark.project.name, benchmark.max_diagnostics);
                 db
             })
         });

crates/ruff_benchmark/src/lib.rs

@@ -1,6 +1,6 @@
 use std::path::PathBuf;
 
-#[cfg(any(feature = "ty_instrumented", feature = "ruff_instrumented"))]
+#[cfg(feature = "instrumented")]
 pub mod criterion;
 pub mod real_world_projects;
 

crates/ruff_db/src/cancellation.rs

@@ -1,51 +0,0 @@
-use std::sync::Arc;
-use std::sync::atomic::AtomicBool;
-
-/// Signals a [`CancellationToken`] that it should be canceled.
-#[derive(Debug, Clone)]
-pub struct CancellationTokenSource {
-    cancelled: Arc<AtomicBool>,
-}
-
-impl Default for CancellationTokenSource {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-impl CancellationTokenSource {
-    pub fn new() -> Self {
-        Self {
-            cancelled: Arc::new(AtomicBool::new(false)),
-        }
-    }
-
-    pub fn is_cancellation_requested(&self) -> bool {
-        self.cancelled.load(std::sync::atomic::Ordering::Relaxed)
-    }
-
-    /// Creates a new token that uses this source.
-    pub fn token(&self) -> CancellationToken {
-        CancellationToken {
-            cancelled: self.cancelled.clone(),
-        }
-    }
-
-    /// Requests cancellation for operations using this token.
-    pub fn cancel(&self) {
-        self.cancelled
-            .store(true, std::sync::atomic::Ordering::Relaxed);
-    }
-}
-
-/// Token signals whether an operation should be canceled.
-#[derive(Debug, Clone)]
-pub struct CancellationToken {
-    cancelled: Arc<AtomicBool>,
-}
-
-impl CancellationToken {
-    pub fn is_cancelled(&self) -> bool {
-        self.cancelled.load(std::sync::atomic::Ordering::Relaxed)
-    }
-}

crates/ruff_db/src/diagnostic/mod.rs

@@ -1,4 +1,4 @@
-use std::{borrow::Cow, fmt::Formatter, path::Path, sync::Arc};
+use std::{fmt::Formatter, path::Path, sync::Arc};
 
 use ruff_diagnostics::{Applicability, Fix};
 use ruff_source_file::{LineColumn, SourceCode, SourceFile};
@@ -11,7 +11,6 @@ pub use self::render::{
     ceil_char_boundary,
     github::{DisplayGithubDiagnostics, GithubRenderer},
 };
-use crate::cancellation::CancellationToken;
 use crate::{Db, files::File};
 
 mod render;
@@ -411,6 +410,11 @@ impl Diagnostic {
         self.id().is_invalid_syntax()
     }
 
+    /// Returns the message body to display to the user.
+    pub fn body(&self) -> &str {
+        self.primary_message()
+    }
+
     /// Returns the message of the first sub-diagnostic with a `Help` severity.
     ///
     /// Note that this is used as the fix title/suggestion for some of Ruff's output formats, but in
@@ -1308,8 +1312,6 @@ pub struct DisplayDiagnosticConfig {
     show_fix_diff: bool,
     /// The lowest applicability that should be shown when reporting diagnostics.
     fix_applicability: Applicability,
-
-    cancellation_token: Option<CancellationToken>,
 }
 
 impl DisplayDiagnosticConfig {
@@ -1383,20 +1385,6 @@ impl DisplayDiagnosticConfig {
     pub fn fix_applicability(&self) -> Applicability {
         self.fix_applicability
     }
-
-    pub fn with_cancellation_token(
-        mut self,
-        token: Option<CancellationToken>,
-    ) -> DisplayDiagnosticConfig {
-        self.cancellation_token = token;
-        self
-    }
-
-    pub fn is_canceled(&self) -> bool {
-        self.cancellation_token
-            .as_ref()
-            .is_some_and(|token| token.is_cancelled())
-    }
 }
 
 impl Default for DisplayDiagnosticConfig {
@@ -1410,7 +1398,6 @@ impl Default for DisplayDiagnosticConfig {
             show_fix_status: false,
             show_fix_diff: false,
             fix_applicability: Applicability::Safe,
-            cancellation_token: None,
         }
     }
 }
@@ -1487,15 +1474,6 @@ pub enum ConciseMessage<'a> {
     Custom(&'a str),
 }
 
-impl<'a> ConciseMessage<'a> {
-    pub fn to_str(&self) -> Cow<'a, str> {
-        match self {
-            ConciseMessage::MainDiagnostic(s) | ConciseMessage::Custom(s) => Cow::Borrowed(s),
-            ConciseMessage::Both { .. } => Cow::Owned(self.to_string()),
-        }
-    }
-}
-
 impl std::fmt::Display for ConciseMessage<'_> {
     fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
         match *self {
@@ -1512,16 +1490,6 @@ impl std::fmt::Display for ConciseMessage<'_> {
     }
 }
 
-#[cfg(feature = "serde")]
-impl serde::Serialize for ConciseMessage<'_> {
-    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: serde::Serializer,
-    {
-        serializer.collect_str(self)
-    }
-}
-
 /// A diagnostic message string.
 ///
 /// This is, for all intents and purposes, equivalent to a `Box<str>`.

crates/ruff_db/src/diagnostic/render/azure.rs

@@ -52,7 +52,7 @@ impl AzureRenderer<'_> {
                 f,
                 "code={code};]{body}",
                 code = diag.secondary_code_or_id(),
-                body = diag.concise_message(),
+                body = diag.body(),
             )?;
         }
 

crates/ruff_db/src/diagnostic/render/concise.rs

@@ -28,10 +28,6 @@ impl<'a> ConciseRenderer<'a> {
 
         let sep = fmt_styled(":", stylesheet.separator);
         for diag in diagnostics {
-            if self.config.is_canceled() {
-                return Ok(());
-            }
-
             if let Some(span) = diag.primary_span() {
                 write!(
                     f,

crates/ruff_db/src/diagnostic/render/full.rs

@@ -53,10 +53,6 @@ impl<'a> FullRenderer<'a> {
             .hyperlink(stylesheet.hyperlink);
 
         for diag in diagnostics {
-            if self.config.is_canceled() {
-                return Ok(());
-            }
-
             let resolved = Resolved::new(self.resolver, diag, self.config);
             let renderable = resolved.to_renderable(self.config.context);
             for diag in renderable.diagnostics.iter() {

crates/ruff_db/src/diagnostic/render/github.rs

@@ -49,26 +49,14 @@ impl<'a> GithubRenderer<'a> {
                 }
                 .unwrap_or_default();
 
-                // GitHub Actions workflow commands have constraints on error annotations:
-                // - `col` and `endColumn` cannot be set if `line` and `endLine` are different
-                // See: https://github.com/astral-sh/ruff/issues/22074
-                if start_location.line == end_location.line {
-                    write!(
-                        f,
-                        ",line={row},col={column},endLine={end_row},endColumn={end_column}::",
-                        row = start_location.line,
-                        column = start_location.column,
-                        end_row = end_location.line,
-                        end_column = end_location.column,
-                    )?;
-                } else {
-                    write!(
-                        f,
-                        ",line={row},endLine={end_row}::",
-                        row = start_location.line,
-                        end_row = end_location.line,
-                    )?;
-                }
+                write!(
+                    f,
+                    ",line={row},col={column},endLine={end_row},endColumn={end_column}::",
+                    row = start_location.line,
+                    column = start_location.column,
+                    end_row = end_location.line,
+                    end_column = end_location.column,
+                )?;
 
                 write!(
                     f,
@@ -87,7 +75,7 @@ impl<'a> GithubRenderer<'a> {
                 write!(f, "{id}:", id = diagnostic.id())?;
             }
 
-            writeln!(f, " {}", diagnostic.concise_message())?;
+            writeln!(f, " {}", diagnostic.body())?;
         }
 
         Ok(())

crates/ruff_db/src/diagnostic/render/gitlab.rs

@@ -98,7 +98,7 @@ impl Serialize for SerializedMessages<'_> {
             }
             fingerprints.insert(message_fingerprint);
 
-            let description = diagnostic.concise_message();
+            let description = diagnostic.body();
             let check_name = diagnostic.secondary_code_or_id();
             let severity = match diagnostic.severity() {
                 Severity::Info => "info",

crates/ruff_db/src/diagnostic/render/json.rs

@@ -6,7 +6,7 @@ use ruff_notebook::NotebookIndex;
 use ruff_source_file::{LineColumn, OneIndexed};
 use ruff_text_size::Ranged;
 
-use crate::diagnostic::{ConciseMessage, Diagnostic, DiagnosticSource, DisplayDiagnosticConfig};
+use crate::diagnostic::{Diagnostic, DiagnosticSource, DisplayDiagnosticConfig};
 
 use super::FileResolver;
 
@@ -101,7 +101,7 @@ pub(super) fn diagnostic_to_json<'a>(
         JsonDiagnostic {
             code: diagnostic.secondary_code_or_id(),
             url: diagnostic.documentation_url(),
-            message: diagnostic.concise_message(),
+            message: diagnostic.body(),
             fix,
             cell: notebook_cell_index,
             location: start_location.map(JsonLocation::from),
@@ -113,7 +113,7 @@ pub(super) fn diagnostic_to_json<'a>(
         JsonDiagnostic {
             code: diagnostic.secondary_code_or_id(),
             url: diagnostic.documentation_url(),
-            message: diagnostic.concise_message(),
+            message: diagnostic.body(),
             fix,
             cell: notebook_cell_index,
             location: Some(start_location.unwrap_or_default().into()),
@@ -226,7 +226,7 @@ pub(crate) struct JsonDiagnostic<'a> {
     filename: Option<&'a str>,
     fix: Option<JsonFix<'a>>,
     location: Option<JsonLocation>,
-    message: ConciseMessage<'a>,
+    message: &'a str,
     noqa_row: Option<OneIndexed>,
     url: Option<&'a str>,
 }

crates/ruff_db/src/diagnostic/render/junit.rs

@@ -56,17 +56,17 @@ impl<'a> JunitRenderer<'a> {
                         start_location: location,
                     } = diagnostic;
                     let mut status = TestCaseStatus::non_success(NonSuccessKind::Failure);
-                    status.set_message(diagnostic.concise_message().to_str());
+                    status.set_message(diagnostic.body());
 
                     if let Some(location) = location {
                         status.set_description(format!(
                             "line {row}, col {col}, {body}",
                             row = location.line,
                             col = location.column,
-                            body = diagnostic.concise_message()
+                            body = diagnostic.body()
                         ));
                     } else {
-                        status.set_description(diagnostic.concise_message().to_str());
+                        status.set_description(diagnostic.body());
                     }
 
                     let code = diagnostic

crates/ruff_db/src/diagnostic/render/pylint.rs

@@ -55,7 +55,7 @@ impl PylintRenderer<'_> {
                 f,
                 "{path}:{row}: [{code}] {body}",
                 path = filename,
-                body = diagnostic.concise_message()
+                body = diagnostic.body()
             )?;
         }
 

crates/ruff_db/src/diagnostic/render/rdjson.rs

@@ -5,7 +5,7 @@ use ruff_diagnostics::{Edit, Fix};
 use ruff_source_file::{LineColumn, SourceCode};
 use ruff_text_size::Ranged;
 
-use crate::diagnostic::{ConciseMessage, Diagnostic};
+use crate::diagnostic::Diagnostic;
 
 use super::FileResolver;
 
@@ -76,7 +76,7 @@ fn diagnostic_to_rdjson<'a>(
     let edits = diagnostic.fix().map(Fix::edits).unwrap_or_default();
 
     RdjsonDiagnostic {
-        message: diagnostic.concise_message(),
+        message: diagnostic.body(),
         location,
         code: RdjsonCode {
             value: diagnostic
@@ -155,7 +155,7 @@ struct RdjsonDiagnostic<'a> {
     code: RdjsonCode<'a>,
     #[serde(skip_serializing_if = "Option::is_none")]
     location: Option<RdjsonLocation<'a>>,
-    message: ConciseMessage<'a>,
+    message: &'a str,
     #[serde(skip_serializing_if = "Vec::is_empty")]
     suggestions: Vec<RdjsonSuggestion<'a>>,
 }

crates/ruff_db/src/diagnostic/render/snapshots/ruff_db__diagnostic__render__github__tests__syntax_errors.snap

@@ -2,5 +2,5 @@
 source: crates/ruff_db/src/diagnostic/render/github.rs
 expression: env.render_diagnostics(&diagnostics)
 ---
-::error title=ty (invalid-syntax),file=/syntax_errors.py,line=1,endLine=2::syntax_errors.py:1:15: invalid-syntax: Expected one or more symbol names after import
-::error title=ty (invalid-syntax),file=/syntax_errors.py,line=3,endLine=4::syntax_errors.py:3:12: invalid-syntax: Expected ')', found newline
+::error title=ty (invalid-syntax),file=/syntax_errors.py,line=1,col=15,endLine=2,endColumn=1::syntax_errors.py:1:15: invalid-syntax: Expected one or more symbol names after import
+::error title=ty (invalid-syntax),file=/syntax_errors.py,line=3,col=12,endLine=4,endColumn=1::syntax_errors.py:3:12: invalid-syntax: Expected ')', found newline

crates/ruff_db/src/lib.rs

@@ -12,7 +12,6 @@ use std::hash::BuildHasherDefault;
 use std::num::NonZeroUsize;
 use ty_static::EnvVars;
 
-pub mod cancellation;
 pub mod diagnostic;
 pub mod display;
 pub mod file_revision;

crates/ruff_db/src/system/os.rs

@@ -275,16 +275,16 @@ impl OsSystem {
     /// instead of at least one system call for each component between `path` and `prefix`.
     ///
     /// However, using `canonicalize` to resolve the path's casing doesn't work in two cases:
-    /// * if `path` is a symlink, `canonicalize` returns the symlink's target and not the symlink's source path.
-    /// * on Windows: If `path` is a mapped network drive, `canonicalize` returns the UNC path
-    ///   (e.g. `Z:\` is mapped to `\\server\share` and `canonicalize` returns `\\?\UNC\server\share`).
+    /// * if `path` is a symlink because `canonicalize` then returns the symlink's target and not the symlink's source path.
+    /// * on Windows: If `path` is a mapped network drive because `canonicalize` then returns the UNC path
+    ///   (e.g. `Z:\` is mapped to `\\server\share` and `canonicalize` then returns `\\?\UNC\server\share`).
     ///
     /// Symlinks and mapped network drives should be rare enough that this fast path is worth trying first,
     /// even if it comes at a cost for those rare use cases.
     fn path_exists_case_sensitive_fast(&self, path: &SystemPath) -> Option<bool> {
         // This is a more forgiving version of `dunce::simplified` that removes all `\\?\` prefixes on Windows.
         // We use this more forgiving version because we don't intend on using either path for anything other than comparison
-        // and the prefix is only relevant when passing the path to other programs and it's longer than 200 something
+        // and the prefix is only relevant when passing the path to other programs and its longer than 200 something
         // characters.
         fn simplify_ignore_verbatim(path: &SystemPath) -> &SystemPath {
             if cfg!(windows) {
@@ -298,7 +298,9 @@ impl OsSystem {
             }
         }
 
-        let Ok(canonicalized) = path.as_std_path().canonicalize() else {
+        let simplified = simplify_ignore_verbatim(path);
+
+        let Ok(canonicalized) = simplified.as_std_path().canonicalize() else {
             // The path doesn't exist or can't be accessed. The path doesn't exist.
             return Some(false);
         };
@@ -307,13 +309,12 @@ impl OsSystem {
             // The original path is valid UTF8 but the canonicalized path isn't. This definitely suggests
             // that a symlink is involved. Fall back to the slow path.
             tracing::debug!(
-                "Falling back to the slow case-sensitive path existence check because the canonicalized path of `{path}` is not valid UTF-8"
+                "Falling back to the slow case-sensitive path existence check because the canonicalized path of `{simplified}` is not valid UTF-8"
             );
             return None;
         };
 
         let simplified_canonicalized = simplify_ignore_verbatim(&canonicalized);
-        let simplified = simplify_ignore_verbatim(path);
 
         // Test if the paths differ by anything other than casing. If so, that suggests that
         // `path` pointed to a symlink (or some other none reversible path normalization happened).

crates/ruff_dev/Cargo.toml

@@ -14,7 +14,6 @@ license = { workspace = true }
 ty = { workspace = true }
 ty_project = { workspace = true, features = ["schemars"] }
 ty_python_semantic = { workspace = true }
-ty_python_types = { workspace = true }
 ty_static = { workspace = true }
 ruff = { workspace = true }
 ruff_formatter = { workspace = true }

crates/ruff_dev/src/generate_ty_options.rs

@@ -1,13 +1,11 @@
 //! Generate a Markdown-compatible listing of configuration options for `pyproject.toml`.
 
-use std::borrow::Cow;
-use std::{fmt::Write, path::PathBuf};
-
 use anyhow::bail;
 use itertools::Itertools;
 use pretty_assertions::StrComparison;
+use std::{fmt::Write, path::PathBuf};
+
 use ruff_options_metadata::{OptionField, OptionSet, OptionsMetadata, Visit};
-use ruff_python_trivia::textwrap;
 use ty_project::metadata::Options;
 
 use crate::{
@@ -167,69 +165,62 @@ fn emit_field(output: &mut String, name: &str, field: &OptionField, parents: &[S
     let _ = writeln!(output, "**Default value**: `{}`", field.default);
     output.push('\n');
     let _ = writeln!(output, "**Type**: `{}`", field.value_type);
-
     output.push('\n');
     output.push_str("**Example usage**:\n\n");
+    output.push_str(&format_example(
+        "pyproject.toml",
+        &format_header(
+            field.scope,
+            field.example,
+            parents,
+            ConfigurationFile::PyprojectToml,
+        ),
+        field.example,
+    ));
+    output.push('\n');
+}
 
-    for configuration_file in [ConfigurationFile::PyprojectToml, ConfigurationFile::TyToml] {
-        let (header, example) =
-            format_snippet(field.scope, field.example, parents, configuration_file);
-        output.push_str(&format_tab(configuration_file.name(), &header, &example));
-
-        output.push('\n');
+fn format_example(title: &str, header: &str, content: &str) -> String {
+    if header.is_empty() {
+        format!("```toml title=\"{title}\"\n{content}\n```\n",)
+    } else {
+        format!("```toml title=\"{title}\"\n{header}\n{content}\n```\n",)
     }
 }
 
-fn format_tab(tab_name: &str, header: &str, content: &str) -> String {
-    let header = if header.is_empty() {
-        String::new()
-    } else {
-        format!("\n    {header}")
-    };
-    format!(
-        "=== \"{}\"\n\n    ```toml{}\n{}\n    ```\n",
-        tab_name,
-        header,
-        textwrap::indent(content, "    ")
-    )
-}
 /// Format the TOML header for the example usage for a given option.
 ///
-/// For example: `[tool.ty.rules]`.
-fn format_snippet<'a>(
+/// For example: `[tool.ruff.format]` or `[tool.ruff.lint.isort]`.
+fn format_header(
     scope: Option<&str>,
-    example: &'a str,
+    example: &str,
     parents: &[Set],
     configuration: ConfigurationFile,
-) -> (String, Cow<'a, str>) {
-    let mut example = Cow::Borrowed(example);
+) -> String {
+    let tool_parent = match configuration {
+        ConfigurationFile::PyprojectToml => Some("tool.ty"),
+        ConfigurationFile::TyToml => None,
+    };
 
-    let header = configuration
-        .parent_table()
+    let header = tool_parent
         .into_iter()
         .chain(parents.iter().filter_map(|parent| parent.name()))
         .chain(scope)
         .join(".");
 
-    // Rewrite examples starting with `[tool.ty]` or `[[tool.ty]]` to their `ty.toml` equivalent.
-    if matches!(configuration, ConfigurationFile::TyToml) {
-        example = example.replace("[tool.ty.", "[").into();
-    }
-
     // Ex) `[[tool.ty.xx]]`
     if example.starts_with(&format!("[[{header}")) {
-        return (String::new(), example);
+        return String::new();
     }
-
     // Ex) `[tool.ty.rules]`
     if example.starts_with(&format!("[{header}")) {
-        return (String::new(), example);
+        return String::new();
     }
 
     if header.is_empty() {
-        (String::new(), example)
+        String::new()
     } else {
-        (format!("[{header}]"), example)
+        format!("[{header}]")
     }
 }
 
@@ -252,25 +243,10 @@ impl Visit for CollectOptionsVisitor {
 #[derive(Debug, Copy, Clone)]
 enum ConfigurationFile {
     PyprojectToml,
+    #[expect(dead_code)]
     TyToml,
 }
 
-impl ConfigurationFile {
-    const fn name(self) -> &'static str {
-        match self {
-            Self::PyprojectToml => "pyproject.toml",
-            Self::TyToml => "ty.toml",
-        }
-    }
-
-    const fn parent_table(self) -> Option<&'static str> {
-        match self {
-            Self::PyprojectToml => Some("tool.ty"),
-            Self::TyToml => None,
-        }
-    }
-}
-
 #[cfg(test)]
 mod tests {
     use anyhow::Result;

crates/ruff_dev/src/generate_ty_rules.rs

@@ -52,7 +52,7 @@ pub(crate) fn main(args: &Args) -> Result<()> {
 }
 
 fn generate_markdown() -> String {
-    let registry = ty_python_types::default_lint_registry();
+    let registry = ty_python_semantic::default_lint_registry();
 
     let mut output = String::new();
 
@@ -63,7 +63,12 @@ fn generate_markdown() -> String {
     let _ = writeln!(&mut output, "# Rules\n");
 
     let mut lints: Vec<_> = registry.lints().iter().collect();
-    lints.sort_by_key(|a| a.name());
+    lints.sort_by(|a, b| {
+        a.default_level()
+            .cmp(&b.default_level())
+            .reverse()
+            .then_with(|| a.name().cmp(&b.name()))
+    });
 
     for lint in lints {
         let _ = writeln!(&mut output, "## `{rule_name}`\n", rule_name = lint.name());

crates/ruff_graph/Cargo.toml

@@ -16,9 +16,7 @@ ruff_linter = { workspace = true }
 ruff_macros = { workspace = true }
 ruff_python_ast = { workspace = true }
 ruff_python_parser = { workspace = true }
-ty_module_resolver = { workspace = true }
 ty_python_semantic = { workspace = true }
-ty_python_types = { workspace = true }
 
 anyhow = { workspace = true }
 clap = { workspace = true, optional = true }

crates/ruff_graph/src/collector.rs

@@ -3,7 +3,7 @@ use ruff_python_ast::visitor::source_order::{
     SourceOrderVisitor, walk_expr, walk_module, walk_stmt,
 };
 use ruff_python_ast::{self as ast, Expr, Mod, Stmt};
-use ty_module_resolver::ModuleName;
+use ty_python_semantic::ModuleName;
 
 /// Collect all imports for a given Python file.
 #[derive(Default, Debug)]

crates/ruff_graph/src/db.rs

@@ -7,13 +7,11 @@ use ruff_db::files::{File, Files};
 use ruff_db::system::{OsSystem, System, SystemPathBuf};
 use ruff_db::vendored::{VendoredFileSystem, VendoredFileSystemBuilder};
 use ruff_python_ast::PythonVersion;
-use ty_module_resolver::{SearchPathSettings, SearchPaths};
 use ty_python_semantic::lint::{LintRegistry, RuleSelection};
 use ty_python_semantic::{
-    AnalysisSettings, Db, Program, ProgramSettings, PythonEnvironment, PythonPlatform,
-    PythonVersionSource, PythonVersionWithSource, SysPrefixPathOrigin,
+    Db, Program, ProgramSettings, PythonEnvironment, PythonPlatform, PythonVersionSource,
+    PythonVersionWithSource, SearchPathSettings, SysPrefixPathOrigin, default_lint_registry,
 };
-use ty_python_types::default_lint_registry;
 
 static EMPTY_VENDORED: std::sync::LazyLock<VendoredFileSystem> = std::sync::LazyLock::new(|| {
     let mut builder = VendoredFileSystemBuilder::new(CompressionMethod::Stored);
@@ -28,7 +26,6 @@ pub struct ModuleDb {
     files: Files,
     system: OsSystem,
     rule_selection: Arc<RuleSelection>,
-    analysis_settings: Arc<AnalysisSettings>,
 }
 
 impl ModuleDb {
@@ -88,13 +85,6 @@ impl SourceDb for ModuleDb {
     }
 }
 
-#[salsa::db]
-impl ty_module_resolver::Db for ModuleDb {
-    fn search_paths(&self) -> &SearchPaths {
-        Program::get(self).search_paths(self)
-    }
-}
-
 #[salsa::db]
 impl Db for ModuleDb {
     fn should_check_file(&self, file: File) -> bool {
@@ -112,10 +102,6 @@ impl Db for ModuleDb {
     fn verbose(&self) -> bool {
         false
     }
-
-    fn analysis_settings(&self) -> &AnalysisSettings {
-        &self.analysis_settings
-    }
 }
 
 #[salsa::db]

crates/ruff_graph/src/resolver.rs

@@ -1,6 +1,6 @@
 use ruff_db::files::{File, FilePath, system_path_to_file};
 use ruff_db::system::SystemPath;
-use ty_module_resolver::{
+use ty_python_semantic::{
     ModuleName, resolve_module, resolve_module_confident, resolve_real_module,
     resolve_real_module_confident,
 };

crates/ruff_linter/src/message/grouped.rs

@@ -197,7 +197,7 @@ impl Display for RuleCodeAndBody<'_> {
                         f,
                         "{fix}{body}",
                         fix = format_args!("[{}] ", "*".cyan()),
-                        body = self.message.concise_message(),
+                        body = self.message.body(),
                     );
                 }
             }
@@ -208,14 +208,14 @@ impl Display for RuleCodeAndBody<'_> {
                 f,
                 "{code} {body}",
                 code = code.red().bold(),
-                body = self.message.concise_message(),
+                body = self.message.body(),
             )
         } else {
             write!(
                 f,
                 "{code}: {body}",
                 code = self.message.id().as_str().red().bold(),
-                body = self.message.concise_message(),
+                body = self.message.body(),
             )
         }
     }

crates/ruff_linter/src/message/sarif.rs

@@ -334,7 +334,7 @@ impl<'a> SarifResult<'a> {
             rule_id: RuleCode::from(diagnostic),
             level: "error".to_string(),
             message: SarifMessage {
-                text: diagnostic.concise_message().to_string(),
+                text: diagnostic.body().to_string(),
             },
             fixes: Self::fix(diagnostic, &uri).into_iter().collect(),
             locations: vec![SarifLocation {

crates/ruff_linter/src/rules/flake8_print/rules/print_call.rs

@@ -37,11 +37,10 @@ use crate::{Fix, FixAvailability, Violation};
 /// import logging
 ///
 /// logging.basicConfig(level=logging.INFO)
-/// logger = logging.getLogger(__name__)
 ///
 ///
 /// def sum_less_than_four(a, b):
-///     logger.debug("Calling sum_less_than_four")
+///     logging.debug("Calling sum_less_than_four")
 ///     return a + b < 4
 /// ```
 ///

crates/ruff_server/src/lint.rs

@@ -243,7 +243,7 @@ fn to_lsp_diagnostic(
 ) -> (usize, lsp_types::Diagnostic) {
     let diagnostic_range = diagnostic.range().unwrap_or_default();
     let name = diagnostic.name();
-    let body = diagnostic.concise_message().to_string();
+    let body = diagnostic.body().to_string();
     let fix = diagnostic.fix();
     let suggestion = diagnostic.first_help_text();
     let code = diagnostic.secondary_code();

crates/ruff_wasm/src/lib.rs

@@ -241,7 +241,7 @@ impl Workspace {
                 let range = msg.range().unwrap_or_default();
                 ExpandedMessage {
                     code: msg.secondary_code_or_id().to_string(),
-                    message: msg.concise_message().to_string(),
+                    message: msg.body().to_string(),
                     start_location: source_code
                         .source_location(range.start(), self.position_encoding)
                         .into(),

crates/ty/Cargo.toml

@@ -42,7 +42,6 @@ wild = { workspace = true }
 [dev-dependencies]
 ruff_db = { workspace = true, features = ["testing"] }
 ruff_python_trivia = { workspace = true }
-ty_module_resolver = { workspace = true }
 
 dunce = { workspace = true }
 insta = { workspace = true, features = ["filters"] }

crates/ty/docs/cli.md

@@ -56,7 +56,6 @@ over all configuration files.</p>
 </dd><dt id="ty-check--exit-zero"><a href="#ty-check--exit-zero"><code>--exit-zero</code></a></dt><dd><p>Always use exit code 0, even when there are error-level diagnostics</p>
 </dd><dt id="ty-check--extra-search-path"><a href="#ty-check--extra-search-path"><code>--extra-search-path</code></a> <i>path</i></dt><dd><p>Additional path to use as a module-resolution source (can be passed multiple times).</p>
 <p>This is an advanced option that should usually only be used for first-party or third-party modules that are not installed into your Python environment in a conventional way. Use <code>--python</code> to point ty to your Python environment if it is in an unusual location.</p>
-</dd><dt id="ty-check--force-exclude"><a href="#ty-check--force-exclude"><code>--force-exclude</code></a></dt><dd><p>Enforce exclusions, even for paths passed to ty directly on the command-line. Use <code>--no-force-exclude</code> to disable</p>
 </dd><dt id="ty-check--help"><a href="#ty-check--help"><code>--help</code></a>, <code>-h</code></dt><dd><p>Print help (see a summary with '-h')</p>
 </dd><dt id="ty-check--ignore"><a href="#ty-check--ignore"><code>--ignore</code></a> <i>rule</i></dt><dd><p>Disables the rule. Can be specified multiple times.</p>
 </dd><dt id="ty-check--no-progress"><a href="#ty-check--no-progress"><code>--no-progress</code></a></dt><dd><p>Hide all progress outputs.</p>

crates/ty/docs/configuration.md

@@ -20,59 +20,11 @@ Valid severities are:
 
 **Example usage**:
 
-=== "pyproject.toml"
-
-    ```toml
-    [tool.ty.rules]
-    possibly-unresolved-reference = "warn"
-    division-by-zero = "ignore"
-    ```
-
-=== "ty.toml"
-
-    ```toml
-    [rules]
-    possibly-unresolved-reference = "warn"
-    division-by-zero = "ignore"
-    ```
-
----
-
-## `analysis`
-
-### `respect-type-ignore-comments`
-
-Whether ty should respect `type: ignore` comments.
-
-When set to `false`, `type: ignore` comments are treated like any other normal
-comment and can't be used to suppress ty errors (you have to use `ty: ignore` instead).
-
-Setting this option can be useful when using ty alongside other type checkers or when
-you prefer using `ty: ignore` over `type: ignore`.
-
-Defaults to `true`.
-
-**Default value**: `true`
-
-**Type**: `bool`
-
-**Example usage**:
-
-=== "pyproject.toml"
-
-    ```toml
-    [tool.ty.analysis]
-    # Disable support for `type: ignore` comments
-    respect-type-ignore-comments = false
-    ```
-
-=== "ty.toml"
-
-    ```toml
-    [analysis]
-    # Disable support for `type: ignore` comments
-    respect-type-ignore-comments = false
-    ```
+```toml title="pyproject.toml"
+[tool.ty.rules]
+possibly-unresolved-reference = "warn"
+division-by-zero = "ignore"
+```
 
 ---
 
@@ -95,19 +47,10 @@ configuration setting.
 
 **Example usage**:
 
-=== "pyproject.toml"
-
-    ```toml
-    [tool.ty.environment]
-    extra-paths = ["./shared/my-search-path"]
-    ```
-
-=== "ty.toml"
-
-    ```toml
-    [environment]
-    extra-paths = ["./shared/my-search-path"]
-    ```
+```toml title="pyproject.toml"
+[tool.ty.environment]
+extra-paths = ["./shared/my-search-path"]
+```
 
 ---
 
@@ -135,19 +78,10 @@ This option can be used to point to virtual or system Python environments.
 
 **Example usage**:
 
-=== "pyproject.toml"
-
-    ```toml
-    [tool.ty.environment]
-    python = "./custom-venv-location/.venv"
-    ```
-
-=== "ty.toml"
-
-    ```toml
-    [environment]
-    python = "./custom-venv-location/.venv"
-    ```
+```toml title="pyproject.toml"
+[tool.ty.environment]
+python = "./custom-venv-location/.venv"
+```
 
 ---
 
@@ -171,21 +105,11 @@ If no platform is specified, ty will use the current platform:
 
 **Example usage**:
 
-=== "pyproject.toml"
-
-    ```toml
-    [tool.ty.environment]
-    # Tailor type stubs and conditionalized type definitions to windows.
-    python-platform = "win32"
-    ```
-
-=== "ty.toml"
-
-    ```toml
-    [environment]
-    # Tailor type stubs and conditionalized type definitions to windows.
-    python-platform = "win32"
-    ```
+```toml title="pyproject.toml"
+[tool.ty.environment]
+# Tailor type stubs and conditionalized type definitions to windows.
+python-platform = "win32"
+```
 
 ---
 
@@ -215,19 +139,10 @@ to reflect the differing contents of the standard library across Python versions
 
 **Example usage**:
 
-=== "pyproject.toml"
-
-    ```toml
-    [tool.ty.environment]
-    python-version = "3.12"
-    ```
-
-=== "ty.toml"
-
-    ```toml
-    [environment]
-    python-version = "3.12"
-    ```
+```toml title="pyproject.toml"
+[tool.ty.environment]
+python-version = "3.12"
+```
 
 ---
 
@@ -252,21 +167,11 @@ it will also be included in the first party search path.
 
 **Example usage**:
 
-=== "pyproject.toml"
-
-    ```toml
-    [tool.ty.environment]
-    # Multiple directories (priority order)
-    root = ["./src", "./lib", "./vendor"]
-    ```
-
-=== "ty.toml"
-
-    ```toml
-    [environment]
-    # Multiple directories (priority order)
-    root = ["./src", "./lib", "./vendor"]
-    ```
+```toml title="pyproject.toml"
+[tool.ty.environment]
+# Multiple directories (priority order)
+root = ["./src", "./lib", "./vendor"]
+```
 
 ---
 
@@ -282,19 +187,10 @@ bundled as a zip file in the binary
 
 **Example usage**:
 
-=== "pyproject.toml"
-
-    ```toml
-    [tool.ty.environment]
-    typeshed = "/path/to/custom/typeshed"
-    ```
-
-=== "ty.toml"
-
-    ```toml
-    [environment]
-    typeshed = "/path/to/custom/typeshed"
-    ```
+```toml title="pyproject.toml"
+[tool.ty.environment]
+typeshed = "/path/to/custom/typeshed"
+```
 
 ---
 
@@ -344,29 +240,15 @@ If not specified, defaults to `[]` (excludes no files).
 
 **Example usage**:
 
-=== "pyproject.toml"
-
-    ```toml
-    [[tool.ty.overrides]]
-    exclude = [
-        "generated",
-        "*.proto",
-        "tests/fixtures/**",
-        "!tests/fixtures/important.py"  # Include this one file
-    ]
-    ```
-
-=== "ty.toml"
-
-    ```toml
-    [[overrides]]
-    exclude = [
-        "generated",
-        "*.proto",
-        "tests/fixtures/**",
-        "!tests/fixtures/important.py"  # Include this one file
-    ]
-    ```
+```toml title="pyproject.toml"
+[[tool.ty.overrides]]
+exclude = [
+    "generated",
+    "*.proto",
+    "tests/fixtures/**",
+    "!tests/fixtures/important.py"  # Include this one file
+]
+```
 
 ---
 
@@ -386,25 +268,13 @@ If not specified, defaults to `["**"]` (matches all files).
 
 **Example usage**:
 
-=== "pyproject.toml"
-
-    ```toml
-    [[tool.ty.overrides]]
-    include = [
-        "src",
-        "tests",
-    ]
-    ```
-
-=== "ty.toml"
-
-    ```toml
-    [[overrides]]
-    include = [
-        "src",
-        "tests",
-    ]
-    ```
+```toml title="pyproject.toml"
+[[tool.ty.overrides]]
+include = [
+    "src",
+    "tests",
+]
+```
 
 ---
 
@@ -422,25 +292,13 @@ severity levels or disable them entirely.
 
 **Example usage**:
 
-=== "pyproject.toml"
+```toml title="pyproject.toml"
+[[tool.ty.overrides]]
+include = ["src"]
 
-    ```toml
-    [[tool.ty.overrides]]
-    include = ["src"]
-
-    [tool.ty.overrides.rules]
-    possibly-unresolved-reference = "ignore"
-    ```
-
-=== "ty.toml"
-
-    ```toml
-    [[overrides]]
-    include = ["src"]
-
-    [overrides.rules]
-    possibly-unresolved-reference = "ignore"
-    ```
+[tool.ty.overrides.rules]
+possibly-unresolved-reference = "ignore"
+```
 
 ---
 
@@ -500,29 +358,15 @@ to re-include `dist` use `exclude = ["!dist"]`
 
 **Example usage**:
 
-=== "pyproject.toml"
-
-    ```toml
-    [tool.ty.src]
-    exclude = [
-        "generated",
-        "*.proto",
-        "tests/fixtures/**",
-        "!tests/fixtures/important.py"  # Include this one file
-    ]
-    ```
-
-=== "ty.toml"
-
-    ```toml
-    [src]
-    exclude = [
-        "generated",
-        "*.proto",
-        "tests/fixtures/**",
-        "!tests/fixtures/important.py"  # Include this one file
-    ]
-    ```
+```toml title="pyproject.toml"
+[tool.ty.src]
+exclude = [
+    "generated",
+    "*.proto",
+    "tests/fixtures/**",
+    "!tests/fixtures/important.py"  # Include this one file
+]
+```
 
 ---
 
@@ -555,25 +399,13 @@ matches `<project_root>/src` and not `<project_root>/test/src`).
 
 **Example usage**:
 
-=== "pyproject.toml"
-
-    ```toml
-    [tool.ty.src]
-    include = [
-        "src",
-        "tests",
-    ]
-    ```
-
-=== "ty.toml"
-
-    ```toml
-    [src]
-    include = [
-        "src",
-        "tests",
-    ]
-    ```
+```toml title="pyproject.toml"
+[tool.ty.src]
+include = [
+    "src",
+    "tests",
+]
+```
 
 ---
 
@@ -589,19 +421,10 @@ Enabled by default.
 
 **Example usage**:
 
-=== "pyproject.toml"
-
-    ```toml
-    [tool.ty.src]
-    respect-ignore-files = false
-    ```
-
-=== "ty.toml"
-
-    ```toml
-    [src]
-    respect-ignore-files = false
-    ```
+```toml title="pyproject.toml"
+[tool.ty.src]
+respect-ignore-files = false
+```
 
 ---
 
@@ -627,19 +450,10 @@ it will also be included in the first party search path.
 
 **Example usage**:
 
-=== "pyproject.toml"
-
-    ```toml
-    [tool.ty.src]
-    root = "./app"
-    ```
-
-=== "ty.toml"
-
-    ```toml
-    [src]
-    root = "./app"
-    ```
+```toml title="pyproject.toml"
+[tool.ty.src]
+root = "./app"
+```
 
 ---
 
@@ -657,21 +471,11 @@ Defaults to `false`.
 
 **Example usage**:
 
-=== "pyproject.toml"
-
-    ```toml
-    [tool.ty.terminal]
-    # Error if ty emits any warning-level diagnostics.
-    error-on-warning = true
-    ```
-
-=== "ty.toml"
-
-    ```toml
-    [terminal]
-    # Error if ty emits any warning-level diagnostics.
-    error-on-warning = true
-    ```
+```toml title="pyproject.toml"
+[tool.ty.terminal]
+# Error if ty emits any warning-level diagnostics.
+error-on-warning = true
+```
 
 ---
 
@@ -687,19 +491,10 @@ Defaults to `full`.
 
 **Example usage**:
 
-=== "pyproject.toml"
-
-    ```toml
-    [tool.ty.terminal]
-    output-format = "concise"
-    ```
-
-=== "ty.toml"
-
-    ```toml
-    [terminal]
-    output-format = "concise"
-    ```
+```toml title="pyproject.toml"
+[tool.ty.terminal]
+output-format = "concise"
+```
 
 ---
 

crates/ty/src/args.rs

@@ -154,17 +154,6 @@ pub(crate) struct CheckCommand {
     #[clap(long, overrides_with("respect_ignore_files"), hide = true)]
     no_respect_ignore_files: bool,
 
-    /// Enforce exclusions, even for paths passed to ty directly on the command-line.
-    /// Use `--no-force-exclude` to disable.
-    #[arg(
-        long,
-        overrides_with("no_force_exclude"),
-        help_heading = "File selection"
-    )]
-    force_exclude: bool,
-    #[clap(long, overrides_with("force_exclude"), hide = true)]
-    no_force_exclude: bool,
-
     /// Glob patterns for files to exclude from type checking.
     ///
     /// Uses gitignore-style syntax to exclude files and directories from type checking.
@@ -189,10 +178,6 @@ pub(crate) struct CheckCommand {
 }
 
 impl CheckCommand {
-    pub(crate) fn force_exclude(&self) -> bool {
-        resolve_bool_arg(self.force_exclude, self.no_force_exclude).unwrap_or_default()
-    }
-
     pub(crate) fn into_options(self) -> Options {
         let rules = if self.rules.is_empty() {
             None
@@ -450,12 +435,3 @@ impl ConfigsArg {
         self.0
     }
 }
-
-fn resolve_bool_arg(yes: bool, no: bool) -> Option<bool> {
-    match (yes, no) {
-        (true, false) => Some(true),
-        (false, true) => Some(false),
-        (false, false) => None,
-        (..) => unreachable!("Clap should make this impossible"),
-    }
-}

crates/ty/src/lib.rs

@@ -10,9 +10,9 @@ use ty_static::EnvVars;
 
 use std::fmt::Write;
 use std::process::{ExitCode, Termination};
-use std::sync::Mutex;
 
 use anyhow::Result;
+use std::sync::Mutex;
 
 use crate::args::{CheckCommand, Command, TerminalColor};
 use crate::logging::{VerbosityLevel, setup_tracing};
@@ -22,7 +22,6 @@ use clap::{CommandFactory, Parser};
 use colored::Colorize;
 use crossbeam::channel as crossbeam_channel;
 use rayon::ThreadPoolBuilder;
-use ruff_db::cancellation::{CancellationToken, CancellationTokenSource};
 use ruff_db::diagnostic::{
     Diagnostic, DiagnosticId, DisplayDiagnosticConfig, DisplayDiagnostics, Severity,
 };
@@ -119,12 +118,9 @@ fn run_check(args: CheckCommand) -> anyhow::Result<ExitStatus> {
         .config_file
         .as_ref()
         .map(|path| SystemPath::absolute(path, &cwd));
-    let force_exclude = args.force_exclude();
 
     let mut project_metadata = match &config_file {
-        Some(config_file) => {
-            ProjectMetadata::from_config_file(config_file.clone(), &project_path, &system)?
-        }
+        Some(config_file) => ProjectMetadata::from_config_file(config_file.clone(), &system)?,
         None => ProjectMetadata::discover(&project_path, &system)?,
     };
 
@@ -134,13 +130,11 @@ fn run_check(args: CheckCommand) -> anyhow::Result<ExitStatus> {
     project_metadata.apply_overrides(&project_options_overrides);
 
     let mut db = ProjectDatabase::new(project_metadata, system)?;
-    let project = db.project();
-
-    project.set_verbose(&mut db, verbosity >= VerbosityLevel::Verbose);
-    project.set_force_exclude(&mut db, force_exclude);
 
+    db.project()
+        .set_verbose(&mut db, verbosity >= VerbosityLevel::Verbose);
     if !check_paths.is_empty() {
-        project.set_included_paths(&mut db, check_paths);
+        db.project().set_included_paths(&mut db, check_paths);
     }
 
     let (main_loop, main_loop_cancellation_token) =
@@ -228,11 +222,6 @@ struct MainLoop {
     printer: Printer,
 
     project_options_overrides: ProjectOptionsOverrides,
-
-    /// Cancellation token that gets set by Ctrl+C.
-    /// Used for long-running operations on the main thread. Operations on background threads
-    /// use Salsa's cancellation mechanism.
-    cancellation_token: CancellationToken,
 }
 
 impl MainLoop {
@@ -242,9 +231,6 @@ impl MainLoop {
     ) -> (Self, MainLoopCancellationToken) {
         let (sender, receiver) = crossbeam_channel::bounded(10);
 
-        let cancellation_token_source = CancellationTokenSource::new();
-        let cancellation_token = cancellation_token_source.token();
-
         (
             Self {
                 sender: sender.clone(),
@@ -252,12 +238,8 @@ impl MainLoop {
                 watcher: None,
                 project_options_overrides,
                 printer,
-                cancellation_token,
-            },
-            MainLoopCancellationToken {
-                sender,
-                source: cancellation_token_source,
             },
+            MainLoopCancellationToken { sender },
         )
     }
 
@@ -291,6 +273,9 @@ impl MainLoop {
         let mut revision = 0u64;
 
         while let Ok(message) = self.receiver.recv() {
+            if self.watcher.is_some() {
+                Printer::clear_screen()?;
+            }
             match message {
                 MainLoopMessage::CheckWorkspace => {
                     let db = db.clone();
@@ -329,7 +314,6 @@ impl MainLoop {
                     let display_config = DisplayDiagnosticConfig::default()
                         .format(terminal_settings.output_format.into())
                         .color(colored::control::SHOULD_COLORIZE.should_colorize())
-                        .with_cancellation_token(Some(self.cancellation_token.clone()))
                         .show_fix_diff(true);
 
                     if check_revision == revision {
@@ -373,21 +357,19 @@ impl MainLoop {
                                 )?;
                             }
 
-                            if !self.cancellation_token.is_cancelled() {
-                                if is_human_readable {
-                                    writeln!(
-                                        self.printer.stream_for_failure_summary(),
-                                        "Found {} diagnostic{}",
-                                        diagnostics_count,
-                                        if diagnostics_count > 1 { "s" } else { "" }
-                                    )?;
-                                }
+                            if is_human_readable {
+                                writeln!(
+                                    self.printer.stream_for_failure_summary(),
+                                    "Found {} diagnostic{}",
+                                    diagnostics_count,
+                                    if diagnostics_count > 1 { "s" } else { "" }
+                                )?;
+                            }
 
-                                if exit_status.is_internal_error() {
-                                    tracing::warn!(
-                                        "A fatal error occurred while checking some files. Not all project files were analyzed. See the diagnostics list above for details."
-                                    );
-                                }
+                            if exit_status.is_internal_error() {
+                                tracing::warn!(
+                                    "A fatal error occurred while checking some files. Not all project files were analyzed. See the diagnostics list above for details."
+                                );
                             }
 
                             if self.watcher.is_none() {
@@ -402,15 +384,12 @@ impl MainLoop {
                 }
 
                 MainLoopMessage::ApplyChanges(changes) => {
-                    Printer::clear_screen()?;
-
                     revision += 1;
                     // Automatically cancels any pending queries and waits for them to complete.
                     db.apply_changes(changes, Some(&self.project_options_overrides));
                     if let Some(watcher) = self.watcher.as_mut() {
                         watcher.update(db);
                     }
-
                     self.sender.send(MainLoopMessage::CheckWorkspace).unwrap();
                 }
                 MainLoopMessage::Exit => {
@@ -514,12 +493,10 @@ impl ty_project::ProgressReporter for IndicatifReporter {
 #[derive(Debug)]
 struct MainLoopCancellationToken {
     sender: crossbeam_channel::Sender<MainLoopMessage>,
-    source: CancellationTokenSource,
 }
 
 impl MainLoopCancellationToken {
     fn stop(self) {
-        self.source.cancel();
         self.sender.send(MainLoopMessage::Exit).unwrap();
     }
 }

crates/ty/tests/cli/analysis_options.rs

@@ -1,43 +0,0 @@
-use insta_cmd::assert_cmd_snapshot;
-
-use crate::CliTest;
-
-/// ty ignores `type: ignore` comments when setting `respect-type-ignore-comments=false`
-#[test]
-fn respect_type_ignore_comments_is_turned_off() -> anyhow::Result<()> {
-    let case = CliTest::with_file(
-        "test.py",
-        r#"
-            y = a + 5  # type: ignore
-            "#,
-    )?;
-
-    // Assert that there's an `unresolved-reference` diagnostic (error).
-    assert_cmd_snapshot!(case.command(), @r"
-    success: true
-    exit_code: 0
-    ----- stdout -----
-    All checks passed!
-
-    ----- stderr -----
-    ");
-
-    assert_cmd_snapshot!(case.command().arg("--config").arg("analysis.respect-type-ignore-comments=false"), @r"
-    success: false
-    exit_code: 1
-    ----- stdout -----
-    error[unresolved-reference]: Name `a` used when not defined
-     --> test.py:2:5
-      |
-    2 | y = a + 5  # type: ignore
-      |     ^
-      |
-    info: rule `unresolved-reference` is enabled by default
-
-    Found 1 diagnostic
-
-    ----- stderr -----
-    ");
-
-    Ok(())
-}

crates/ty/tests/cli/config_option.rs

@@ -133,7 +133,7 @@ fn cli_config_args_invalid_option() -> anyhow::Result<()> {
       |
     1 | bad-option=true
       | ^^^^^^^^^^
-    unknown field `bad-option`, expected one of `environment`, `src`, `rules`, `terminal`, `analysis`, `overrides`
+    unknown field `bad-option`, expected one of `environment`, `src`, `rules`, `terminal`, `overrides`
 
 
     Usage: ty <COMMAND>

crates/ty/tests/cli/file_selection.rs

@@ -589,128 +589,6 @@ fn explicit_path_overrides_exclude() -> anyhow::Result<()> {
     Ok(())
 }
 
-/// Test behavior when explicitly checking a path that matches an exclude pattern and `--force-exclude` is provided
-#[test]
-fn explicit_path_overrides_exclude_force_exclude() -> anyhow::Result<()> {
-    let case = CliTest::with_files([
-        (
-            "src/main.py",
-            r#"
-            print(undefined_var)  # error: unresolved-reference
-            "#,
-        ),
-        (
-            "tests/generated.py",
-            r#"
-            print(dist_undefined_var)  # error: unresolved-reference
-            "#,
-        ),
-        (
-            "dist/other.py",
-            r#"
-            print(other_undefined_var)  # error: unresolved-reference
-            "#,
-        ),
-        (
-            "ty.toml",
-            r#"
-            [src]
-            exclude = ["tests/generated.py"]
-            "#,
-        ),
-    ])?;
-
-    // Explicitly checking a file in an excluded directory should still check that file
-    assert_cmd_snapshot!(case.command().arg("tests/generated.py").arg("src/main.py"), @r"
-    success: false
-    exit_code: 1
-    ----- stdout -----
-    error[unresolved-reference]: Name `undefined_var` used when not defined
-     --> src/main.py:2:7
-      |
-    2 | print(undefined_var)  # error: unresolved-reference
-      |       ^^^^^^^^^^^^^
-      |
-    info: rule `unresolved-reference` is enabled by default
-
-    error[unresolved-reference]: Name `dist_undefined_var` used when not defined
-     --> tests/generated.py:2:7
-      |
-    2 | print(dist_undefined_var)  # error: unresolved-reference
-      |       ^^^^^^^^^^^^^^^^^^
-      |
-    info: rule `unresolved-reference` is enabled by default
-
-    Found 2 diagnostics
-
-    ----- stderr -----
-    ");
-
-    // Except when `--force-exclude` is set.
-    assert_cmd_snapshot!(case.command().arg("tests/generated.py").arg("src/main.py").arg("--force-exclude"), @r"
-    success: false
-    exit_code: 1
-    ----- stdout -----
-    error[unresolved-reference]: Name `undefined_var` used when not defined
-     --> src/main.py:2:7
-      |
-    2 | print(undefined_var)  # error: unresolved-reference
-      |       ^^^^^^^^^^^^^
-      |
-    info: rule `unresolved-reference` is enabled by default
-
-    Found 1 diagnostic
-
-    ----- stderr -----
-    ");
-
-    // Explicitly checking the entire excluded directory should check all files in it
-    assert_cmd_snapshot!(case.command().arg("dist/").arg("src/main.py"), @r"
-    success: false
-    exit_code: 1
-    ----- stdout -----
-    error[unresolved-reference]: Name `other_undefined_var` used when not defined
-     --> dist/other.py:2:7
-      |
-    2 | print(other_undefined_var)  # error: unresolved-reference
-      |       ^^^^^^^^^^^^^^^^^^^
-      |
-    info: rule `unresolved-reference` is enabled by default
-
-    error[unresolved-reference]: Name `undefined_var` used when not defined
-     --> src/main.py:2:7
-      |
-    2 | print(undefined_var)  # error: unresolved-reference
-      |       ^^^^^^^^^^^^^
-      |
-    info: rule `unresolved-reference` is enabled by default
-
-    Found 2 diagnostics
-
-    ----- stderr -----
-    ");
-
-    // Except when using `--force-exclude`
-    assert_cmd_snapshot!(case.command().arg("dist/").arg("src/main.py").arg("--force-exclude"), @r"
-    success: false
-    exit_code: 1
-    ----- stdout -----
-    error[unresolved-reference]: Name `undefined_var` used when not defined
-     --> src/main.py:2:7
-      |
-    2 | print(undefined_var)  # error: unresolved-reference
-      |       ^^^^^^^^^^^^^
-      |
-    info: rule `unresolved-reference` is enabled by default
-
-    Found 1 diagnostic
-
-    ----- stderr -----
-    ");
-
-    Ok(())
-}
-
 #[test]
 fn cli_and_configuration_exclude() -> anyhow::Result<()> {
     let case = CliTest::with_files([

crates/ty/tests/cli/main.rs

@@ -1,4 +1,3 @@
-mod analysis_options;
 mod config_option;
 mod exit_code;
 mod file_selection;
@@ -659,8 +658,6 @@ fn gitlab_diagnostics() -> anyhow::Result<()> {
         r#"
         print(x)     # [unresolved-reference]
         print(4[1])  # [non-subscriptable]
-        from typing_extensions import reveal_type
-        reveal_type('str'.lower())  # [revealed-type]
         "#,
     )?;
 
@@ -711,25 +708,6 @@ fn gitlab_diagnostics() -> anyhow::Result<()> {
             }
           }
         }
-      },
-      {
-        "check_name": "revealed-type",
-        "description": "revealed-type: Revealed type: `LiteralString`",
-        "severity": "info",
-        "fingerprint": "[FINGERPRINT]",
-        "location": {
-          "path": "test.py",
-          "positions": {
-            "begin": {
-              "line": 5,
-              "column": 13
-            },
-            "end": {
-              "line": 5,
-              "column": 26
-            }
-          }
-        }
       }
     ]
     ----- stderr -----
@@ -745,8 +723,6 @@ fn github_diagnostics() -> anyhow::Result<()> {
         r#"
         print(x)     # [unresolved-reference]
         print(4[1])  # [non-subscriptable]
-        from typing_extensions import reveal_type
-        reveal_type('str'.lower())  # [revealed-type]
         "#,
     )?;
 
@@ -756,7 +732,6 @@ fn github_diagnostics() -> anyhow::Result<()> {
     ----- stdout -----
     ::warning title=ty (unresolved-reference),file=<temp_dir>/test.py,line=2,col=7,endLine=2,endColumn=8::test.py:2:7: unresolved-reference: Name `x` used when not defined
     ::error title=ty (non-subscriptable),file=<temp_dir>/test.py,line=3,col=7,endLine=3,endColumn=11::test.py:3:7: non-subscriptable: Cannot subscript object of type `Literal[4]` with no `__getitem__` method
-    ::notice title=ty (revealed-type),file=<temp_dir>/test.py,line=5,col=13,endLine=5,endColumn=26::test.py:5:13: revealed-type: Revealed type: `LiteralString`
 
     ----- stderr -----
     ");

crates/ty/tests/file_watching.rs

@@ -10,13 +10,12 @@ use ruff_db::system::{
     OsSystem, System, SystemPath, SystemPathBuf, UserConfigDirectoryOverrideGuard, file_time_now,
 };
 use ruff_python_ast::PythonVersion;
-use ty_module_resolver::{Module, ModuleName, resolve_module_confident};
 use ty_project::metadata::options::{EnvironmentOptions, Options, ProjectOptionsOverrides};
 use ty_project::metadata::pyproject::{PyProject, Tool};
 use ty_project::metadata::value::{RangedValue, RelativePathBuf};
 use ty_project::watch::{ChangeEvent, ProjectWatcher, directory_watcher};
 use ty_project::{Db, ProjectDatabase, ProjectMetadata};
-use ty_python_semantic::PythonPlatform;
+use ty_python_semantic::{Module, ModuleName, PythonPlatform, resolve_module_confident};
 
 struct TestCase {
     db: ProjectDatabase,
@@ -1020,7 +1019,7 @@ fn search_path() -> anyhow::Result<()> {
     let site_packages = case.root_path().join("site_packages");
 
     assert_eq!(
-        resolve_module_confident(case.db(), &ModuleName::new_static("a").unwrap()),
+        resolve_module_confident(case.db(), &ModuleName::new("a").unwrap()),
         None
     );
 
@@ -1193,7 +1192,7 @@ fn changed_versions_file() -> anyhow::Result<()> {
 
     // Unset the custom typeshed directory.
     assert_eq!(
-        resolve_module_confident(case.db(), &ModuleName::new_static("os").unwrap()),
+        resolve_module_confident(case.db(), &ModuleName::new("os").unwrap()),
         None
     );
 
@@ -1208,7 +1207,7 @@ fn changed_versions_file() -> anyhow::Result<()> {
 
     case.apply_changes(changes, None);
 
-    assert!(resolve_module_confident(case.db(), &ModuleName::new_static("os").unwrap()).is_some());
+    assert!(resolve_module_confident(case.db(), &ModuleName::new("os").unwrap()).is_some());
 
     Ok(())
 }
@@ -1875,11 +1874,11 @@ fn rename_files_casing_only() -> anyhow::Result<()> {
     let mut case = setup([("lib.py", "class Foo: ...")])?;
 
     assert!(
-        resolve_module_confident(case.db(), &ModuleName::new_static("lib").unwrap()).is_some(),
+        resolve_module_confident(case.db(), &ModuleName::new("lib").unwrap()).is_some(),
         "Expected `lib` module to exist."
     );
     assert_eq!(
-        resolve_module_confident(case.db(), &ModuleName::new_static("Lib").unwrap()),
+        resolve_module_confident(case.db(), &ModuleName::new("Lib").unwrap()),
         None,
         "Expected `Lib` module not to exist"
     );
@@ -1912,13 +1911,13 @@ fn rename_files_casing_only() -> anyhow::Result<()> {
 
     // Resolving `lib` should now fail but `Lib` should now succeed
     assert_eq!(
-        resolve_module_confident(case.db(), &ModuleName::new_static("lib").unwrap()),
+        resolve_module_confident(case.db(), &ModuleName::new("lib").unwrap()),
         None,
         "Expected `lib` module to no longer exist."
     );
 
     assert!(
-        resolve_module_confident(case.db(), &ModuleName::new_static("Lib").unwrap()).is_some(),
+        resolve_module_confident(case.db(), &ModuleName::new("Lib").unwrap()).is_some(),
         "Expected `Lib` module to exist"
     );
 

crates/ty_combine/Cargo.toml

@@ -12,6 +12,7 @@ license.workspace = true
 [dependencies]
 ruff_db = { workspace = true }
 ruff_python_ast = { workspace = true }
+ty_python_semantic = { workspace = true }
 
 ordermap = { workspace = true }
 

crates/ty_combine/src/lib.rs

@@ -8,6 +8,7 @@ use std::{collections::HashMap, hash::BuildHasher};
 use ordermap::OrderMap;
 use ruff_db::system::SystemPathBuf;
 use ruff_python_ast::PythonVersion;
+use ty_python_semantic::PythonPlatform;
 
 /// Combine two values, preferring the values in `self`.
 ///
@@ -144,6 +145,7 @@ macro_rules! impl_noop_combine {
 }
 
 impl_noop_combine!(SystemPathBuf);
+impl_noop_combine!(PythonPlatform);
 impl_noop_combine!(PythonVersion);
 
 // std types

crates/ty_completion_eval/Cargo.toml

@@ -15,8 +15,8 @@ ruff_db = { workspace = true, features = ["os"] }
 ruff_text_size = { workspace = true }
 
 ty_ide = { workspace = true }
-ty_module_resolver = { workspace = true }
 ty_project = { workspace = true }
+ty_python_semantic = { workspace = true }
 
 anyhow = { workspace = true }
 bstr = { workspace = true }

crates/ty_completion_eval/completion-evaluation-tasks.csv

@@ -28,4 +28,4 @@ scope-simple-long-identifier,main.py,0,1
 tstring-completions,main.py,0,1
 ty-extensions-lower-stdlib,main.py,0,9
 type-var-typing-over-ast,main.py,0,3
-type-var-typing-over-ast,main.py,1,253
+type-var-typing-over-ast,main.py,1,251

crates/ty_completion_eval/src/main.rs

@@ -15,11 +15,11 @@ use regex::bytes::Regex;
 use ruff_db::files::system_path_to_file;
 use ruff_db::system::{OsSystem, SystemPath, SystemPathBuf};
 use ty_ide::Completion;
-use ty_module_resolver::ModuleName;
 use ty_project::metadata::Options;
 use ty_project::metadata::options::EnvironmentOptions;
 use ty_project::metadata::value::RelativePathBuf;
 use ty_project::{ProjectDatabase, ProjectMetadata};
+use ty_python_semantic::ModuleName;
 
 #[derive(Debug, clap::Parser)]
 #[command(

crates/ty_ide/Cargo.toml

@@ -22,9 +22,7 @@ ruff_python_importer = { workspace = true }
 ruff_python_trivia = { workspace = true }
 ruff_source_file = { workspace = true }
 ruff_text_size = { workspace = true }
-ty_module_resolver = { workspace = true }
 ty_python_semantic = { workspace = true }
-ty_python_types = { workspace = true }
 ty_project = { workspace = true, features = ["testing"] }
 ty_vendored = { workspace = true }
 

crates/ty_ide/src/all_symbols.rs

@@ -1,6 +1,6 @@
 use ruff_db::files::File;
-use ty_module_resolver::{Module, ModuleName, all_modules, resolve_real_shadowable_module};
 use ty_project::Db;
+use ty_python_semantic::{Module, ModuleName, all_modules, resolve_real_shadowable_module};
 
 use crate::{
     SymbolKind,
@@ -21,7 +21,7 @@ pub fn all_symbols<'db>(
         return Vec::new();
     }
 
-    let typing_extensions = ModuleName::new_static("typing_extensions").unwrap();
+    let typing_extensions = ModuleName::new("typing_extensions").unwrap();
     let is_typing_extensions_available = importing_from.is_stub(db)
         || resolve_real_shadowable_module(db, importing_from, &typing_extensions).is_some();
 

crates/ty_ide/src/code_action.rs

@@ -7,7 +7,7 @@ use ruff_text_size::TextRange;
 use ty_project::Db;
 use ty_python_semantic::create_suppression_fix;
 use ty_python_semantic::lint::LintId;
-use ty_python_types::types::{UNDEFINED_REVEAL, UNRESOLVED_REFERENCE};
+use ty_python_semantic::types::{UNDEFINED_REVEAL, UNRESOLVED_REFERENCE};
 
 /// A `QuickFix` Code Action
 #[derive(Debug, Clone)]
@@ -87,8 +87,10 @@ mod tests {
     use ruff_python_trivia::textwrap::dedent;
     use ruff_text_size::{TextRange, TextSize};
     use ty_project::ProjectMetadata;
-    use ty_python_semantic::lint::LintMetadata;
-    use ty_python_types::types::{UNDEFINED_REVEAL, UNRESOLVED_REFERENCE};
+    use ty_python_semantic::{
+        lint::LintMetadata,
+        types::{UNDEFINED_REVEAL, UNRESOLVED_REFERENCE},
+    };
 
     #[test]
     fn add_ignore() {

crates/ty_ide/src/completion.rs

@@ -11,9 +11,11 @@ use ruff_python_ast::{self as ast, AnyNodeRef};
 use ruff_python_codegen::Stylist;
 use ruff_text_size::{Ranged, TextRange, TextSize};
 use rustc_hash::FxHashSet;
-use ty_module_resolver::{KnownModule, ModuleName};
-use ty_python_types::types::{CycleDetector, KnownClass, Type, UnionType};
-use ty_python_types::{Completion as SemanticCompletion, NameKind, SemanticModel};
+use ty_python_semantic::types::UnionType;
+use ty_python_semantic::{
+    Completion as SemanticCompletion, KnownModule, ModuleName, NameKind, SemanticModel,
+    types::{CycleDetector, KnownClass, Type},
+};
 
 use crate::docstring::Docstring;
 use crate::goto::Definitions;
@@ -2104,7 +2106,7 @@ mod tests {
     use insta::assert_snapshot;
     use ruff_python_ast::token::{TokenKind, Tokens};
     use ruff_python_parser::{Mode, ParseOptions};
-    use ty_module_resolver::ModuleName;
+    use ty_python_semantic::ModuleName;
 
     use crate::completion::{Completion, completion};
     use crate::tests::{CursorTest, CursorTestBuilder};

crates/ty_ide/src/doc_highlights.rs

@@ -3,7 +3,7 @@ use crate::references::{ReferencesMode, references};
 use crate::{Db, ReferenceTarget};
 use ruff_db::files::File;
 use ruff_text_size::TextSize;
-use ty_python_types::SemanticModel;
+use ty_python_semantic::SemanticModel;
 
 /// Find all document highlights for a symbol at the given position.
 /// Document highlights are limited to the current file only.

crates/ty_ide/src/find_references.rs

@@ -3,7 +3,7 @@ use crate::references::{ReferencesMode, references};
 use crate::{Db, ReferenceTarget};
 use ruff_db::files::File;
 use ruff_text_size::TextSize;
-use ty_python_types::SemanticModel;
+use ty_python_semantic::SemanticModel;
 
 /// Find all references to a symbol at the given position.
 /// Search for references across all files in the project.

crates/ty_ide/src/goto.rs

@@ -12,12 +12,12 @@ use ruff_python_ast::token::{TokenKind, Tokens};
 use ruff_python_ast::{self as ast, AnyNodeRef};
 use ruff_text_size::{Ranged, TextRange, TextSize};
 
-use ty_python_types::ResolvedDefinition;
-use ty_python_types::types::Type;
-use ty_python_types::types::ide_support::{
+use ty_python_semantic::ResolvedDefinition;
+use ty_python_semantic::types::Type;
+use ty_python_semantic::types::ide_support::{
     call_signature_details, call_type_simplified_by_overloads, definitions_for_keyword_argument,
 };
-use ty_python_types::{
+use ty_python_semantic::{
     HasDefinition, HasType, ImportAliasResolution, SemanticModel, definitions_for_imported_symbol,
     definitions_for_name,
 };
@@ -228,15 +228,15 @@ impl<'db> Definitions<'db> {
     pub(crate) fn from_ty(db: &'db dyn crate::Db, ty: Type<'db>) -> Option<Self> {
         let ty_def = ty.definition(db)?;
         let resolved = match ty_def {
-            ty_python_types::types::TypeDefinition::Module(module) => {
+            ty_python_semantic::types::TypeDefinition::Module(module) => {
                 ResolvedDefinition::Module(module.file(db)?)
             }
-            ty_python_types::types::TypeDefinition::Class(definition)
-            | ty_python_types::types::TypeDefinition::Function(definition)
-            | ty_python_types::types::TypeDefinition::TypeVar(definition)
-            | ty_python_types::types::TypeDefinition::TypeAlias(definition)
-            | ty_python_types::types::TypeDefinition::SpecialForm(definition)
-            | ty_python_types::types::TypeDefinition::NewType(definition) => {
+            ty_python_semantic::types::TypeDefinition::Class(definition)
+            | ty_python_semantic::types::TypeDefinition::Function(definition)
+            | ty_python_semantic::types::TypeDefinition::TypeVar(definition)
+            | ty_python_semantic::types::TypeDefinition::TypeAlias(definition)
+            | ty_python_semantic::types::TypeDefinition::SpecialForm(definition)
+            | ty_python_semantic::types::TypeDefinition::NewType(definition) => {
                 ResolvedDefinition::Definition(definition)
             }
         };
@@ -338,11 +338,11 @@ impl GotoTarget<'_> {
                 }
             }
             GotoTarget::BinOp { expression, .. } => {
-                let (_, ty) = ty_python_types::definitions_for_bin_op(model, expression)?;
+                let (_, ty) = ty_python_semantic::definitions_for_bin_op(model, expression)?;
                 Some(ty)
             }
             GotoTarget::UnaryOp { expression, .. } => {
-                let (_, ty) = ty_python_types::definitions_for_unary_op(model, expression)?;
+                let (_, ty) = ty_python_semantic::definitions_for_unary_op(model, expression)?;
                 Some(ty)
             }
             // TODO: Support identifier targets
@@ -526,14 +526,15 @@ impl GotoTarget<'_> {
             }
 
             GotoTarget::BinOp { expression, .. } => {
-                let (definitions, _) = ty_python_types::definitions_for_bin_op(model, expression)?;
+                let (definitions, _) =
+                    ty_python_semantic::definitions_for_bin_op(model, expression)?;
 
                 Some(definitions)
             }
 
             GotoTarget::UnaryOp { expression, .. } => {
                 let (definitions, _) =
-                    ty_python_types::definitions_for_unary_op(model, expression)?;
+                    ty_python_semantic::definitions_for_unary_op(model, expression)?;
 
                 Some(definitions)
             }
@@ -938,12 +939,12 @@ impl Ranged for GotoTarget<'_> {
 /// Converts a collection of `ResolvedDefinition` items into `NavigationTarget` items.
 fn convert_resolved_definitions_to_targets<'db>(
     db: &'db dyn ty_python_semantic::Db,
-    definitions: Vec<ty_python_types::ResolvedDefinition<'db>>,
+    definitions: Vec<ty_python_semantic::ResolvedDefinition<'db>>,
 ) -> Vec<crate::NavigationTarget> {
     definitions
         .into_iter()
         .map(|resolved_definition| match resolved_definition {
-            ty_python_types::ResolvedDefinition::Definition(definition) => {
+            ty_python_semantic::ResolvedDefinition::Definition(definition) => {
                 // Get the parsed module for range calculation
                 let definition_file = definition.file(db);
                 let module = ruff_db::parsed::parsed_module(db, definition_file).load(db);
@@ -958,11 +959,11 @@ fn convert_resolved_definitions_to_targets<'db>(
                     full_range: full_range.range(),
                 }
             }
-            ty_python_types::ResolvedDefinition::Module(file) => {
+            ty_python_semantic::ResolvedDefinition::Module(file) => {
                 // For modules, navigate to the start of the file
                 crate::NavigationTarget::new(file, TextRange::default())
             }
-            ty_python_types::ResolvedDefinition::FileWithRange(file_range) => {
+            ty_python_semantic::ResolvedDefinition::FileWithRange(file_range) => {
                 // For file ranges, navigate to the specific range within the file
                 crate::NavigationTarget::from(file_range)
             }
@@ -983,9 +984,9 @@ fn definitions_for_expression<'db>(
             expression.into(),
             alias_resolution,
         )),
-        ast::ExprRef::Attribute(attribute) => {
-            Some(ty_python_types::definitions_for_attribute(model, attribute))
-        }
+        ast::ExprRef::Attribute(attribute) => Some(ty_python_semantic::definitions_for_attribute(
+            model, attribute,
+        )),
         _ => None,
     }
 }
@@ -1006,7 +1007,7 @@ fn definitions_for_callable<'db>(
 fn definitions_to_navigation_targets<'db>(
     db: &dyn ty_python_semantic::Db,
     stub_mapper: Option<&StubMapper<'db>>,
-    mut definitions: Vec<ty_python_types::ResolvedDefinition<'db>>,
+    mut definitions: Vec<ty_python_semantic::ResolvedDefinition<'db>>,
 ) -> Option<crate::NavigationTargets> {
     if let Some(mapper) = stub_mapper {
         definitions = mapper.map_definitions(definitions);

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_types::{ImportAliasResolution, SemanticModel};
+use ty_python_semantic::{ImportAliasResolution, SemanticModel};
 
 /// Navigate to the declaration of a symbol.
 ///

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_types::{ImportAliasResolution, SemanticModel};
+use ty_python_semantic::{ImportAliasResolution, SemanticModel};
 
 /// Navigate to the definition of a symbol.
 ///

crates/ty_ide/src/goto_type_definition.rs

@@ -3,7 +3,7 @@ use crate::{Db, HasNavigationTargets, NavigationTargets, RangedValue};
 use ruff_db::files::{File, FileRange};
 use ruff_db::parsed::parsed_module;
 use ruff_text_size::{Ranged, TextSize};
-use ty_python_types::SemanticModel;
+use ty_python_semantic::SemanticModel;
 
 pub fn goto_type_definition(
     db: &dyn Db,
@@ -718,8 +718,26 @@ mod tests {
             "#,
         );
 
-        // TODO: This should jump to the definition of `Alias` above.
-        assert_snapshot!(test.goto_type_definition(), @"No type definitions found");
+        assert_snapshot!(test.goto_type_definition(), @r#"
+        info[goto-type-definition]: Type definition
+         --> main.py:4:1
+          |
+        2 | from typing_extensions import TypeAliasType
+        3 |
+        4 | Alias = TypeAliasType("Alias", tuple[int, int])
+          | ^^^^^
+        5 |
+        6 | Alias
+          |
+        info: Source
+         --> main.py:6:1
+          |
+        4 | Alias = TypeAliasType("Alias", tuple[int, int])
+        5 |
+        6 | Alias
+          | ^^^^^
+          |
+        "#);
     }
 
     #[test]
@@ -1339,13 +1357,13 @@ f(**kwargs<CURSOR>)
           |     ^^^^^^ Clicking here
           |
         info: Found 1 type definition
-            --> stdlib/builtins.pyi:2947:7
+            --> stdlib/builtins.pyi:2920:7
              |
-        2946 | @disjoint_base
-        2947 | class dict(MutableMapping[_KT, _VT]):
+        2919 | @disjoint_base
+        2920 | class dict(MutableMapping[_KT, _VT]):
              |       ----
-        2948 |     """dict() -> new empty dictionary
-        2949 |     dict(mapping) -> new dictionary initialized from a mapping object's
+        2921 |     """dict() -> new empty dictionary
+        2922 |     dict(mapping) -> new dictionary initialized from a mapping object's
              |
         "#);
     }

crates/ty_ide/src/hover.rs

@@ -6,8 +6,8 @@ use ruff_db::parsed::parsed_module;
 use ruff_text_size::{Ranged, TextSize};
 use std::fmt;
 use std::fmt::Formatter;
-use ty_python_types::types::{KnownInstanceType, Type, TypeVarVariance};
-use ty_python_types::{DisplaySettings, SemanticModel};
+use ty_python_semantic::types::{KnownInstanceType, Type, TypeVarVariance};
+use ty_python_semantic::{DisplaySettings, SemanticModel};
 
 pub fn hover(db: &dyn Db, file: File, offset: TextSize) -> Option<RangedValue<Hover<'_>>> {
     let parsed = parsed_module(db, file).load(db);
@@ -23,7 +23,7 @@ pub fn hover(db: &dyn Db, file: File, offset: TextSize) -> Option<RangedValue<Ho
     let docs = goto_target
         .get_definition_targets(
             &model,
-            ty_python_types::ImportAliasResolution::ResolveAliases,
+            ty_python_semantic::ImportAliasResolution::ResolveAliases,
         )
         .and_then(|definitions| definitions.docstring(db))
         .map(HoverContent::Docstring);
@@ -2956,295 +2956,6 @@ def function():
         assert_snapshot!(test.hover(), @"Hover provided no content");
     }
 
-    #[test]
-    fn hover_func_with_concat_docstring() {
-        let test = cursor_test(
-            r#"
-        def a<CURSOR>b():
-            """wow cool docs""" """and docs"""
-            return
-        "#,
-        );
-
-        assert_snapshot!(test.hover(), @r#"
-        def ab() -> Unknown
-        ---------------------------------------------
-        wow cool docsand docs
-
-        ---------------------------------------------
-        ```python
-        def ab() -> Unknown
-        ```
-        ---
-        wow cool docsand docs
-        ---------------------------------------------
-        info[hover]: Hovered content is
-         --> main.py:2:5
-          |
-        2 | def ab():
-          |     ^-
-          |     ||
-          |     |Cursor offset
-          |     source
-        3 |     """wow cool docs""" """and docs"""
-        4 |     return
-          |
-        "#);
-    }
-
-    #[test]
-    fn hover_func_with_plus_docstring() {
-        let test = cursor_test(
-            r#"
-        def a<CURSOR>b():
-            """wow cool docs""" + """and docs"""
-            return
-        "#,
-        );
-
-        assert_snapshot!(test.hover(), @r#"
-        def ab() -> Unknown
-        ---------------------------------------------
-        ```python
-        def ab() -> Unknown
-        ```
-        ---------------------------------------------
-        info[hover]: Hovered content is
-         --> main.py:2:5
-          |
-        2 | def ab():
-          |     ^-
-          |     ||
-          |     |Cursor offset
-          |     source
-        3 |     """wow cool docs""" + """and docs"""
-        4 |     return
-          |
-        "#);
-    }
-
-    #[test]
-    fn hover_func_with_slash_docstring() {
-        let test = cursor_test(
-            r#"
-        def a<CURSOR>b():
-            """wow cool docs""" \
-            """and docs"""
-            return
-        "#,
-        );
-
-        assert_snapshot!(test.hover(), @r#"
-        def ab() -> Unknown
-        ---------------------------------------------
-        wow cool docsand docs
-
-        ---------------------------------------------
-        ```python
-        def ab() -> Unknown
-        ```
-        ---
-        wow cool docsand docs
-        ---------------------------------------------
-        info[hover]: Hovered content is
-         --> main.py:2:5
-          |
-        2 | def ab():
-          |     ^-
-          |     ||
-          |     |Cursor offset
-          |     source
-        3 |     """wow cool docs""" \
-        4 |     """and docs"""
-          |
-        "#);
-    }
-
-    #[test]
-    fn hover_func_with_sameline_commented_docstring() {
-        let test = cursor_test(
-            r#"
-        def a<CURSOR>b():
-            """wow cool docs""" # and a comment
-            """and docs"""      # that shouldn't be included
-            return
-        "#,
-        );
-
-        assert_snapshot!(test.hover(), @r#"
-        def ab() -> Unknown
-        ---------------------------------------------
-        wow cool docs
-
-        ---------------------------------------------
-        ```python
-        def ab() -> Unknown
-        ```
-        ---
-        wow cool docs
-        ---------------------------------------------
-        info[hover]: Hovered content is
-         --> main.py:2:5
-          |
-        2 | def ab():
-          |     ^-
-          |     ||
-          |     |Cursor offset
-          |     source
-        3 |     """wow cool docs""" # and a comment
-        4 |     """and docs"""      # that shouldn't be included
-          |
-        "#);
-    }
-
-    #[test]
-    fn hover_func_with_nextline_commented_docstring() {
-        let test = cursor_test(
-            r#"
-        def a<CURSOR>b():
-            """wow cool docs""" 
-            # and a comment that shouldn't be included
-            """and docs"""
-            return
-        "#,
-        );
-
-        assert_snapshot!(test.hover(), @r#"
-        def ab() -> Unknown
-        ---------------------------------------------
-        wow cool docs
-
-        ---------------------------------------------
-        ```python
-        def ab() -> Unknown
-        ```
-        ---
-        wow cool docs
-        ---------------------------------------------
-        info[hover]: Hovered content is
-         --> main.py:2:5
-          |
-        2 | def ab():
-          |     ^-
-          |     ||
-          |     |Cursor offset
-          |     source
-        3 |     """wow cool docs""" 
-        4 |     # and a comment that shouldn't be included
-          |
-        "#);
-    }
-
-    #[test]
-    fn hover_func_with_parens_docstring() {
-        let test = cursor_test(
-            r#"
-        def a<CURSOR>b():
-            (
-                """wow cool docs""" 
-                """and docs"""
-            )
-            return
-        "#,
-        );
-
-        assert_snapshot!(test.hover(), @r#"
-        def ab() -> Unknown
-        ---------------------------------------------
-        wow cool docsand docs
-
-        ---------------------------------------------
-        ```python
-        def ab() -> Unknown
-        ```
-        ---
-        wow cool docsand docs
-        ---------------------------------------------
-        info[hover]: Hovered content is
-         --> main.py:2:5
-          |
-        2 | def ab():
-          |     ^-
-          |     ||
-          |     |Cursor offset
-          |     source
-        3 |     (
-        4 |         """wow cool docs""" 
-          |
-        "#);
-    }
-
-    #[test]
-    fn hover_func_with_nextline_commented_parens_docstring() {
-        let test = cursor_test(
-            r#"
-        def a<CURSOR>b():
-            (
-                """wow cool docs""" 
-                # and a comment that shouldn't be included
-                """and docs"""
-            )
-            return
-        "#,
-        );
-
-        assert_snapshot!(test.hover(), @r#"
-        def ab() -> Unknown
-        ---------------------------------------------
-        wow cool docsand docs
-
-        ---------------------------------------------
-        ```python
-        def ab() -> Unknown
-        ```
-        ---
-        wow cool docsand docs
-        ---------------------------------------------
-        info[hover]: Hovered content is
-         --> main.py:2:5
-          |
-        2 | def ab():
-          |     ^-
-          |     ||
-          |     |Cursor offset
-          |     source
-        3 |     (
-        4 |         """wow cool docs""" 
-          |
-        "#);
-    }
-
-    #[test]
-    fn hover_attribute_docstring_spill() {
-        let test = cursor_test(
-            r#"
-        if True:
-            a<CURSOR>b = 1
-        "this shouldn't be a docstring but also it doesn't matter much"
-        "#,
-        );
-
-        assert_snapshot!(test.hover(), @r#"
-        Literal[1]
-        ---------------------------------------------
-        ```python
-        Literal[1]
-        ```
-        ---------------------------------------------
-        info[hover]: Hovered content is
-         --> main.py:3:5
-          |
-        2 | if True:
-        3 |     ab = 1
-          |     ^-
-          |     ||
-          |     |Cursor offset
-          |     source
-        4 | "this shouldn't be a docstring but also it doesn't matter much"
-          |
-        "#);
-    }
-
     #[test]
     fn hover_class_typevar_variance() {
         let test = cursor_test(

crates/ty_ide/src/importer.rs

@@ -29,11 +29,10 @@ use ruff_python_ast::visitor::source_order::{SourceOrderVisitor, TraversalSignal
 use ruff_python_codegen::Stylist;
 use ruff_python_importer::Insertion;
 use ruff_text_size::{Ranged, TextRange, TextSize};
-use ty_module_resolver::ModuleName;
 use ty_project::Db;
 use ty_python_semantic::semantic_index::definition::DefinitionKind;
-use ty_python_types::types::Type;
-use ty_python_types::{MemberDefinition, SemanticModel};
+use ty_python_semantic::types::Type;
+use ty_python_semantic::{MemberDefinition, ModuleName, SemanticModel};
 
 pub(crate) struct Importer<'a> {
     /// The ty Salsa database.
@@ -881,10 +880,11 @@ mod tests {
     use ruff_python_codegen::Stylist;
     use ruff_python_trivia::textwrap::dedent;
     use ruff_text_size::TextSize;
-    use ty_module_resolver::SearchPathSettings;
     use ty_project::ProjectMetadata;
-    use ty_python_semantic::{Program, ProgramSettings, PythonPlatform, PythonVersionWithSource};
-    use ty_python_types::SemanticModel;
+    use ty_python_semantic::{
+        Program, ProgramSettings, PythonPlatform, PythonVersionWithSource, SearchPathSettings,
+        SemanticModel,
+    };
 
     use super::*;
 

crates/ty_ide/src/inlay_hints.rs

@@ -6,9 +6,9 @@ use ruff_db::parsed::parsed_module;
 use ruff_python_ast::visitor::source_order::{self, SourceOrderVisitor, TraversalSignal};
 use ruff_python_ast::{AnyNodeRef, ArgOrKeyword, Expr, ExprUnaryOp, Stmt, UnaryOp};
 use ruff_text_size::{Ranged, TextRange, TextSize};
-use ty_python_types::types::ide_support::inlay_hint_call_argument_details;
-use ty_python_types::types::{Type, TypeDetail};
-use ty_python_types::{HasType, SemanticModel};
+use ty_python_semantic::types::ide_support::inlay_hint_call_argument_details;
+use ty_python_semantic::types::{Type, TypeDetail};
+use ty_python_semantic::{HasType, SemanticModel};
 
 #[derive(Debug, Clone)]
 pub struct InlayHint {
@@ -1241,12 +1241,12 @@ mod tests {
 
         ---------------------------------------------
         info[inlay-hint-location]: Inlay Hint Target
-            --> stdlib/builtins.pyi:2722:7
+            --> stdlib/builtins.pyi:2695:7
              |
-        2721 | @disjoint_base
-        2722 | class tuple(Sequence[_T_co]):
+        2694 | @disjoint_base
+        2695 | class tuple(Sequence[_T_co]):
              |       ^^^^^
-        2723 |     """Built-in immutable sequence.
+        2696 |     """Built-in immutable sequence.
              |
         info: Source
           --> main2.py:8:5
@@ -1335,12 +1335,12 @@ mod tests {
            |
 
         info[inlay-hint-location]: Inlay Hint Target
-            --> stdlib/builtins.pyi:2722:7
+            --> stdlib/builtins.pyi:2695:7
              |
-        2721 | @disjoint_base
-        2722 | class tuple(Sequence[_T_co]):
+        2694 | @disjoint_base
+        2695 | class tuple(Sequence[_T_co]):
              |       ^^^^^
-        2723 |     """Built-in immutable sequence.
+        2696 |     """Built-in immutable sequence.
              |
         info: Source
           --> main2.py:9:5
@@ -1391,12 +1391,12 @@ mod tests {
            |
 
         info[inlay-hint-location]: Inlay Hint Target
-            --> stdlib/builtins.pyi:2722:7
+            --> stdlib/builtins.pyi:2695:7
              |
-        2721 | @disjoint_base
-        2722 | class tuple(Sequence[_T_co]):
+        2694 | @disjoint_base
+        2695 | class tuple(Sequence[_T_co]):
              |       ^^^^^
-        2723 |     """Built-in immutable sequence.
+        2696 |     """Built-in immutable sequence.
              |
         info: Source
           --> main2.py:10:5
@@ -2217,12 +2217,12 @@ mod tests {
 
         ---------------------------------------------
         info[inlay-hint-location]: Inlay Hint Target
-            --> stdlib/builtins.pyi:2829:7
+            --> stdlib/builtins.pyi:2802:7
              |
-        2828 | @disjoint_base
-        2829 | class list(MutableSequence[_T]):
+        2801 | @disjoint_base
+        2802 | class list(MutableSequence[_T]):
              |       ^^^^
-        2830 |     """Built-in mutable sequence.
+        2803 |     """Built-in mutable sequence.
              |
         info: Source
          --> main2.py:2:5
@@ -2270,12 +2270,12 @@ mod tests {
           |
 
         info[inlay-hint-location]: Inlay Hint Target
-            --> stdlib/builtins.pyi:2829:7
+            --> stdlib/builtins.pyi:2802:7
              |
-        2828 | @disjoint_base
-        2829 | class list(MutableSequence[_T]):
+        2801 | @disjoint_base
+        2802 | class list(MutableSequence[_T]):
              |       ^^^^
-        2830 |     """Built-in mutable sequence.
+        2803 |     """Built-in mutable sequence.
              |
         info: Source
          --> main2.py:3:5
@@ -2325,12 +2325,12 @@ mod tests {
           |
 
         info[inlay-hint-location]: Inlay Hint Target
-            --> stdlib/builtins.pyi:2829:7
+            --> stdlib/builtins.pyi:2802:7
              |
-        2828 | @disjoint_base
-        2829 | class list(MutableSequence[_T]):
+        2801 | @disjoint_base
+        2802 | class list(MutableSequence[_T]):
              |       ^^^^
-        2830 |     """Built-in mutable sequence.
+        2803 |     """Built-in mutable sequence.
              |
         info: Source
          --> main2.py:4:5
@@ -2364,13 +2364,13 @@ mod tests {
           |
 
         info[inlay-hint-location]: Inlay Hint Target
-            --> stdlib/builtins.pyi:2618:7
+            --> stdlib/builtins.pyi:2591:7
              |
-        2617 | @final
-        2618 | class bool(int):
+        2590 | @final
+        2591 | class bool(int):
              |       ^^^^
-        2619 |     """Returns True when the argument is true, False otherwise.
-        2620 |     The builtins True and False are the only two instances of the class bool.
+        2592 |     """Returns True when the argument is true, False otherwise.
+        2593 |     The builtins True and False are the only two instances of the class bool.
              |
         info: Source
          --> main2.py:4:20
@@ -2384,12 +2384,12 @@ mod tests {
           |
 
         info[inlay-hint-location]: Inlay Hint Target
-            --> stdlib/builtins.pyi:2829:7
+            --> stdlib/builtins.pyi:2802:7
              |
-        2828 | @disjoint_base
-        2829 | class list(MutableSequence[_T]):
+        2801 | @disjoint_base
+        2802 | class list(MutableSequence[_T]):
              |       ^^^^
-        2830 |     """Built-in mutable sequence.
+        2803 |     """Built-in mutable sequence.
              |
         info: Source
          --> main2.py:5:5
@@ -2443,12 +2443,12 @@ mod tests {
           |
 
         info[inlay-hint-location]: Inlay Hint Target
-            --> stdlib/builtins.pyi:2829:7
+            --> stdlib/builtins.pyi:2802:7
              |
-        2828 | @disjoint_base
-        2829 | class list(MutableSequence[_T]):
+        2801 | @disjoint_base
+        2802 | class list(MutableSequence[_T]):
              |       ^^^^
-        2830 |     """Built-in mutable sequence.
+        2803 |     """Built-in mutable sequence.
              |
         info: Source
          --> main2.py:6:5
@@ -2502,12 +2502,12 @@ mod tests {
           |
 
         info[inlay-hint-location]: Inlay Hint Target
-            --> stdlib/builtins.pyi:2829:7
+            --> stdlib/builtins.pyi:2802:7
              |
-        2828 | @disjoint_base
-        2829 | class list(MutableSequence[_T]):
+        2801 | @disjoint_base
+        2802 | class list(MutableSequence[_T]):
              |       ^^^^
-        2830 |     """Built-in mutable sequence.
+        2803 |     """Built-in mutable sequence.
              |
         info: Source
          --> main2.py:7:5
@@ -2561,12 +2561,12 @@ mod tests {
           |
 
         info[inlay-hint-location]: Inlay Hint Target
-            --> stdlib/builtins.pyi:2829:7
+            --> stdlib/builtins.pyi:2802:7
              |
-        2828 | @disjoint_base
-        2829 | class list(MutableSequence[_T]):
+        2801 | @disjoint_base
+        2802 | class list(MutableSequence[_T]):
              |       ^^^^
-        2830 |     """Built-in mutable sequence.
+        2803 |     """Built-in mutable sequence.
              |
         info: Source
           --> main2.py:8:5
@@ -2620,12 +2620,12 @@ mod tests {
            |
 
         info[inlay-hint-location]: Inlay Hint Target
-            --> stdlib/builtins.pyi:2829:7
+            --> stdlib/builtins.pyi:2802:7
              |
-        2828 | @disjoint_base
-        2829 | class list(MutableSequence[_T]):
+        2801 | @disjoint_base
+        2802 | class list(MutableSequence[_T]):
              |       ^^^^
-        2830 |     """Built-in mutable sequence.
+        2803 |     """Built-in mutable sequence.
              |
         info: Source
           --> main2.py:9:5
@@ -2678,12 +2678,12 @@ mod tests {
            |
 
         info[inlay-hint-location]: Inlay Hint Target
-            --> stdlib/builtins.pyi:2829:7
+            --> stdlib/builtins.pyi:2802:7
              |
-        2828 | @disjoint_base
-        2829 | class list(MutableSequence[_T]):
+        2801 | @disjoint_base
+        2802 | class list(MutableSequence[_T]):
              |       ^^^^
-        2830 |     """Built-in mutable sequence.
+        2803 |     """Built-in mutable sequence.
              |
         info: Source
           --> main2.py:10:5
@@ -2737,12 +2737,12 @@ mod tests {
            |
 
         info[inlay-hint-location]: Inlay Hint Target
-            --> stdlib/builtins.pyi:2829:7
+            --> stdlib/builtins.pyi:2802:7
              |
-        2828 | @disjoint_base
-        2829 | class list(MutableSequence[_T]):
+        2801 | @disjoint_base
+        2802 | class list(MutableSequence[_T]):
              |       ^^^^
-        2830 |     """Built-in mutable sequence.
+        2803 |     """Built-in mutable sequence.
              |
         info: Source
           --> main2.py:11:5
@@ -2811,12 +2811,12 @@ mod tests {
            |
 
         info[inlay-hint-location]: Inlay Hint Target
-            --> stdlib/builtins.pyi:2829:7
+            --> stdlib/builtins.pyi:2802:7
              |
-        2828 | @disjoint_base
-        2829 | class list(MutableSequence[_T]):
+        2801 | @disjoint_base
+        2802 | class list(MutableSequence[_T]):
              |       ^^^^
-        2830 |     """Built-in mutable sequence.
+        2803 |     """Built-in mutable sequence.
              |
         info: Source
           --> main2.py:12:5
@@ -2925,12 +2925,12 @@ mod tests {
 
         ---------------------------------------------
         info[inlay-hint-location]: Inlay Hint Target
-            --> stdlib/builtins.pyi:2722:7
+            --> stdlib/builtins.pyi:2695:7
              |
-        2721 | @disjoint_base
-        2722 | class tuple(Sequence[_T_co]):
+        2694 | @disjoint_base
+        2695 | class tuple(Sequence[_T_co]):
              |       ^^^^^
-        2723 |     """Built-in immutable sequence.
+        2696 |     """Built-in immutable sequence.
              |
         info: Source
          --> main2.py:7:5
@@ -3092,12 +3092,12 @@ mod tests {
 
         ---------------------------------------------
         info[inlay-hint-location]: Inlay Hint Target
-            --> stdlib/builtins.pyi:2829:7
+            --> stdlib/builtins.pyi:2802:7
              |
-        2828 | @disjoint_base
-        2829 | class list(MutableSequence[_T]):
+        2801 | @disjoint_base
+        2802 | class list(MutableSequence[_T]):
              |       ^^^^
-        2830 |     """Built-in mutable sequence.
+        2803 |     """Built-in mutable sequence.
              |
         info: Source
          --> main2.py:4:18
@@ -3110,12 +3110,12 @@ mod tests {
           |
 
         info[inlay-hint-location]: Inlay Hint Target
-            --> stdlib/builtins.pyi:2722:7
+            --> stdlib/builtins.pyi:2695:7
              |
-        2721 | @disjoint_base
-        2722 | class tuple(Sequence[_T_co]):
+        2694 | @disjoint_base
+        2695 | class tuple(Sequence[_T_co]):
              |       ^^^^^
-        2723 |     """Built-in immutable sequence.
+        2696 |     """Built-in immutable sequence.
              |
         info: Source
          --> main2.py:5:18
@@ -3248,12 +3248,12 @@ mod tests {
           |
 
         info[inlay-hint-location]: Inlay Hint Target
-            --> stdlib/builtins.pyi:2722:7
+            --> stdlib/builtins.pyi:2695:7
              |
-        2721 | @disjoint_base
-        2722 | class tuple(Sequence[_T_co]):
+        2694 | @disjoint_base
+        2695 | class tuple(Sequence[_T_co]):
              |       ^^^^^
-        2723 |     """Built-in immutable sequence.
+        2696 |     """Built-in immutable sequence.
              |
         info: Source
           --> main2.py:8:5
@@ -4250,12 +4250,12 @@ mod tests {
         foo([x=]y[0])
         ---------------------------------------------
         info[inlay-hint-location]: Inlay Hint Target
-            --> stdlib/builtins.pyi:2829:7
+            --> stdlib/builtins.pyi:2802:7
              |
-        2828 | @disjoint_base
-        2829 | class list(MutableSequence[_T]):
+        2801 | @disjoint_base
+        2802 | class list(MutableSequence[_T]):
              |       ^^^^
-        2830 |     """Built-in mutable sequence.
+        2803 |     """Built-in mutable sequence.
              |
         info: Source
          --> main2.py:3:5
@@ -4303,12 +4303,12 @@ mod tests {
           |
 
         info[inlay-hint-location]: Inlay Hint Target
-            --> stdlib/builtins.pyi:2829:7
+            --> stdlib/builtins.pyi:2802:7
              |
-        2828 | @disjoint_base
-        2829 | class list(MutableSequence[_T]):
+        2801 | @disjoint_base
+        2802 | class list(MutableSequence[_T]):
              |       ^^^^
-        2830 |     """Built-in mutable sequence.
+        2803 |     """Built-in mutable sequence.
              |
         info: Source
          --> main2.py:4:5
@@ -5609,12 +5609,12 @@ mod tests {
           |
 
         info[inlay-hint-location]: Inlay Hint Target
-            --> stdlib/builtins.pyi:2829:7
+            --> stdlib/builtins.pyi:2802:7
              |
-        2828 | @disjoint_base
-        2829 | class list(MutableSequence[_T]):
+        2801 | @disjoint_base
+        2802 | class list(MutableSequence[_T]):
              |       ^^^^
-        2830 |     """Built-in mutable sequence.
+        2803 |     """Built-in mutable sequence.
              |
         info: Source
          --> main2.py:3:14
@@ -6046,13 +6046,13 @@ mod tests {
           |
 
         info[inlay-hint-location]: Inlay Hint Target
-            --> stdlib/builtins.pyi:2618:7
+            --> stdlib/builtins.pyi:2591:7
              |
-        2617 | @final
-        2618 | class bool(int):
+        2590 | @final
+        2591 | class bool(int):
              |       ^^^^
-        2619 |     """Returns True when the argument is true, False otherwise.
-        2620 |     The builtins True and False are the only two instances of the class bool.
+        2592 |     """Returns True when the argument is true, False otherwise.
+        2593 |     The builtins True and False are the only two instances of the class bool.
              |
         info: Source
          --> main2.py:4:25
@@ -6100,12 +6100,12 @@ mod tests {
           |
 
         info[inlay-hint-location]: Inlay Hint Target
-            --> stdlib/builtins.pyi:2829:7
+            --> stdlib/builtins.pyi:2802:7
              |
-        2828 | @disjoint_base
-        2829 | class list(MutableSequence[_T]):
+        2801 | @disjoint_base
+        2802 | class list(MutableSequence[_T]):
              |       ^^^^
-        2830 |     """Built-in mutable sequence.
+        2803 |     """Built-in mutable sequence.
              |
         info: Source
          --> main2.py:4:49
@@ -6614,6 +6614,13 @@ mod tests {
         3 |     y[: type[T@f]] = x
           |              ^^^
           |
+
+        ---------------------------------------------
+        info[inlay-hint-edit]: File after edits
+        info: Source
+
+        def f[T](x: type[T]):
+            y: type[T@f] = x
         "#);
     }
 
@@ -6732,14 +6739,14 @@ mod tests {
         A = TypeAliasType([name=]'A', [value=]str)
         ---------------------------------------------
         info[inlay-hint-location]: Inlay Hint Target
-            --> stdlib/typing.pyi:2037:26
+            --> stdlib/typing.pyi:2032:26
              |
-        2035 |         """
-        2036 |
-        2037 |         def __new__(cls, name: str, value: Any, *, type_params: tuple[_TypeParameter, ...] = ()) -> Self: ...
+        2030 |         """
+        2031 |
+        2032 |         def __new__(cls, name: str, value: Any, *, type_params: tuple[_TypeParameter, ...] = ()) -> Self: ...
              |                          ^^^^
-        2038 |         @property
-        2039 |         def __value__(self) -> Any: ...  # AnnotationForm
+        2033 |         @property
+        2034 |         def __value__(self) -> Any: ...  # AnnotationForm
              |
         info: Source
          --> main2.py:3:20
@@ -6750,14 +6757,14 @@ mod tests {
           |
 
         info[inlay-hint-location]: Inlay Hint Target
-            --> stdlib/typing.pyi:2037:37
+            --> stdlib/typing.pyi:2032:37
              |
-        2035 |         """
-        2036 |
-        2037 |         def __new__(cls, name: str, value: Any, *, type_params: tuple[_TypeParameter, ...] = ()) -> Self: ...
+        2030 |         """
+        2031 |
+        2032 |         def __new__(cls, name: str, value: Any, *, type_params: tuple[_TypeParameter, ...] = ()) -> Self: ...
              |                                     ^^^^^
-        2038 |         @property
-        2039 |         def __value__(self) -> Any: ...  # AnnotationForm
+        2033 |         @property
+        2034 |         def __value__(self) -> Any: ...  # AnnotationForm
              |
         info: Source
          --> main2.py:3:32

crates/ty_ide/src/lib.rs

@@ -57,7 +57,7 @@ use ruff_text_size::{Ranged, TextRange};
 use rustc_hash::FxHashSet;
 use std::ops::{Deref, DerefMut};
 use ty_project::Db;
-use ty_python_types::types::{Type, TypeDefinition};
+use ty_python_semantic::types::{Type, TypeDefinition};
 
 /// Information associated with a text range.
 #[derive(Debug, Copy, Clone, Eq, PartialEq, Hash)]

crates/ty_ide/src/references.rs

@@ -20,7 +20,7 @@ use ruff_python_ast::{
     visitor::source_order::{SourceOrderVisitor, TraversalSignal},
 };
 use ruff_text_size::{Ranged, TextRange};
-use ty_python_types::{ImportAliasResolution, SemanticModel};
+use ty_python_semantic::{ImportAliasResolution, SemanticModel};
 
 /// Mode for references search behavior
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]

crates/ty_ide/src/rename.rs

@@ -3,7 +3,7 @@ use crate::references::{ReferencesMode, references};
 use crate::{Db, ReferenceTarget};
 use ruff_db::files::File;
 use ruff_text_size::{Ranged, TextSize};
-use ty_python_types::SemanticModel;
+use ty_python_semantic::SemanticModel;
 
 /// 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> {

crates/ty_ide/src/signature_help.rs

@@ -15,13 +15,13 @@ use ruff_python_ast::find_node::covering_node;
 use ruff_python_ast::token::TokenKind;
 use ruff_python_ast::{self as ast, AnyNodeRef};
 use ruff_text_size::{Ranged, TextRange, TextSize};
+use ty_python_semantic::ResolvedDefinition;
+use ty_python_semantic::SemanticModel;
 use ty_python_semantic::semantic_index::definition::Definition;
-use ty_python_types::ResolvedDefinition;
-use ty_python_types::SemanticModel;
-use ty_python_types::types::ide_support::{
+use ty_python_semantic::types::ide_support::{
     CallSignatureDetails, call_signature_details, find_active_signature_from_details,
 };
-use ty_python_types::types::{ParameterKind, Type};
+use ty_python_semantic::types::{ParameterKind, Type};
 
 // TODO: We may want to add special-case handling for calls to constructors
 // so the class docstring is used in place of (or inaddition to) any docstring

crates/ty_ide/src/stub_mapping.rs

@@ -1,6 +1,6 @@
 use itertools::Either;
 use ruff_db::system::SystemPathBuf;
-use ty_python_types::{ResolvedDefinition, map_stub_definition};
+use ty_python_semantic::{ResolvedDefinition, map_stub_definition};
 
 use crate::cached_vendored_root;
 

crates/ty_ide/src/symbols.rs

@@ -14,8 +14,8 @@ use ruff_python_ast::name::{Name, UnqualifiedName};
 use ruff_python_ast::visitor::source_order::{self, SourceOrderVisitor};
 use ruff_text_size::{Ranged, TextRange};
 use rustc_hash::{FxHashMap, FxHashSet};
-use ty_module_resolver::{ModuleName, resolve_module};
 use ty_project::Db;
+use ty_python_semantic::{ModuleName, resolve_module};
 
 use crate::completion::CompletionKind;
 

crates/ty_module_resolver/Cargo.toml

@@ -1,38 +0,0 @@
-[package]
-name = "ty_module_resolver"
-version = "0.0.0"
-publish = false
-authors = { workspace = true }
-edition = { workspace = true }
-rust-version = { workspace = true }
-homepage = { workspace = true }
-documentation = { workspace = true }
-repository = { workspace = true }
-license = { workspace = true }
-
-[dependencies]
-ruff_db = { workspace = true }
-ruff_memory_usage = { workspace = true }
-ruff_python_ast = { workspace = true, features = ["salsa"] }
-ruff_python_stdlib = { workspace = true }
-
-camino = { workspace = true }
-compact_str = { workspace = true }
-get-size2 = { workspace = true }
-rustc-hash = { workspace = true }
-salsa = { workspace = true }
-thiserror = { workspace = true }
-tracing = { workspace = true }
-strum = { workspace = true }
-strum_macros = { workspace = true }
-
-[dev-dependencies]
-ruff_db = { workspace = true, features = ["testing", "os"] }
-ty_vendored = { workspace = true }
-
-anyhow = { workspace = true }
-insta = { workspace = true, features = ["filters"] }
-tempfile = { workspace = true }
-
-[lints]
-workspace = true

crates/ty_module_resolver/src/db.rs

@@ -1,124 +0,0 @@
-use ruff_db::Db as SourceDb;
-
-use crate::resolve::SearchPaths;
-
-#[salsa::db]
-pub trait Db: SourceDb {
-    /// Returns the search paths for module resolution.
-    fn search_paths(&self) -> &SearchPaths;
-}
-
-#[cfg(test)]
-pub(crate) mod tests {
-    use std::sync::{Arc, Mutex};
-
-    use ruff_db::Db as SourceDb;
-    use ruff_db::files::Files;
-    use ruff_db::system::{DbWithTestSystem, TestSystem};
-    use ruff_db::vendored::VendoredFileSystem;
-    use ruff_python_ast::PythonVersion;
-
-    use super::Db;
-    use crate::resolve::SearchPaths;
-
-    type Events = Arc<Mutex<Vec<salsa::Event>>>;
-
-    #[salsa::db]
-    #[derive(Clone)]
-    pub(crate) struct TestDb {
-        storage: salsa::Storage<Self>,
-        files: Files,
-        system: TestSystem,
-        vendored: VendoredFileSystem,
-        search_paths: Arc<SearchPaths>,
-        python_version: PythonVersion,
-        events: Events,
-    }
-
-    impl TestDb {
-        pub(crate) fn new() -> Self {
-            let events = Events::default();
-            Self {
-                storage: salsa::Storage::new(Some(Box::new({
-                    let events = events.clone();
-                    move |event| {
-                        tracing::trace!("event: {event:?}");
-                        let mut events = events.lock().unwrap();
-                        events.push(event);
-                    }
-                }))),
-                system: TestSystem::default(),
-                vendored: ty_vendored::file_system().clone(),
-                files: Files::default(),
-                search_paths: Arc::new(SearchPaths::empty(ty_vendored::file_system())),
-                python_version: PythonVersion::default(),
-                events,
-            }
-        }
-
-        pub(crate) fn with_search_paths(mut self, search_paths: SearchPaths) -> Self {
-            self.set_search_paths(search_paths);
-            self
-        }
-
-        pub(crate) fn with_python_version(mut self, python_version: PythonVersion) -> Self {
-            self.python_version = python_version;
-            self
-        }
-
-        pub(crate) fn set_search_paths(&mut self, search_paths: SearchPaths) {
-            search_paths.try_register_static_roots(self);
-            self.search_paths = Arc::new(search_paths);
-        }
-
-        /// Takes the salsa events.
-        pub(crate) fn take_salsa_events(&mut self) -> Vec<salsa::Event> {
-            let mut events = self.events.lock().unwrap();
-            std::mem::take(&mut *events)
-        }
-
-        /// Clears the salsa events.
-        pub(crate) fn clear_salsa_events(&mut self) {
-            self.take_salsa_events();
-        }
-    }
-
-    impl DbWithTestSystem for TestDb {
-        fn test_system(&self) -> &TestSystem {
-            &self.system
-        }
-
-        fn test_system_mut(&mut self) -> &mut TestSystem {
-            &mut self.system
-        }
-    }
-
-    #[salsa::db]
-    impl SourceDb for TestDb {
-        fn vendored(&self) -> &VendoredFileSystem {
-            &self.vendored
-        }
-
-        fn system(&self) -> &dyn ruff_db::system::System {
-            &self.system
-        }
-
-        fn files(&self) -> &Files {
-            &self.files
-        }
-
-        fn python_version(&self) -> PythonVersion {
-            self.python_version
-        }
-    }
-
-    #[salsa::db]
-    impl Db for TestDb {
-        fn search_paths(&self) -> &SearchPaths {
-            &self.search_paths
-        }
-    }
-
-    #[salsa::db]
-    impl salsa::Database for TestDb {}
-}

crates/ty_module_resolver/src/settings.rs

@@ -1,105 +0,0 @@
-//! Search path configuration settings.
-
-use ruff_db::system::{System, SystemPathBuf};
-use ruff_db::vendored::VendoredFileSystem;
-
-use crate::path::SearchPathError;
-use crate::resolve::SearchPaths;
-use crate::typeshed::TypeshedVersionsParseError;
-
-/// How to handle apparent misconfiguration
-#[derive(PartialEq, Eq, Debug, Copy, Clone, Default, get_size2::GetSize)]
-pub enum MisconfigurationMode {
-    /// Settings Failure Is Not An Error.
-    ///
-    /// This is used by the default database, which we are incentivized to make infallible,
-    /// while still trying to "do our best" to set things up properly where we can.
-    UseDefault,
-    /// Settings Failure Is An Error.
-    #[default]
-    Fail,
-}
-
-/// Configures the search paths for module resolution.
-#[derive(Eq, PartialEq, Debug, Clone)]
-pub struct SearchPathSettings {
-    /// List of user-provided paths that should take first priority in the module resolution.
-    /// Examples in other type checkers are mypy's MYPYPATH environment variable,
-    /// or pyright's stubPath configuration setting.
-    pub extra_paths: Vec<SystemPathBuf>,
-
-    /// The root of the project, used for finding first-party modules.
-    pub src_roots: Vec<SystemPathBuf>,
-
-    /// Optional path to a "custom typeshed" directory on disk for us to use for standard-library types.
-    /// If this is not provided, we will fallback to our vendored typeshed stubs for the stdlib,
-    /// bundled as a zip file in the binary
-    pub custom_typeshed: Option<SystemPathBuf>,
-
-    /// List of site packages paths to use.
-    pub site_packages_paths: Vec<SystemPathBuf>,
-
-    /// Option path to the real stdlib on the system, and not some instance of typeshed.
-    ///
-    /// We should ideally only ever use this for things like goto-definition,
-    /// where typeshed isn't the right answer.
-    pub real_stdlib_path: Option<SystemPathBuf>,
-
-    /// How to handle apparent misconfiguration
-    pub misconfiguration_mode: MisconfigurationMode,
-}
-
-impl SearchPathSettings {
-    pub fn new(src_roots: Vec<SystemPathBuf>) -> Self {
-        Self {
-            src_roots,
-            ..SearchPathSettings::empty()
-        }
-    }
-
-    pub fn empty() -> Self {
-        SearchPathSettings {
-            src_roots: vec![],
-            extra_paths: vec![],
-            custom_typeshed: None,
-            site_packages_paths: vec![],
-            real_stdlib_path: None,
-            misconfiguration_mode: MisconfigurationMode::Fail,
-        }
-    }
-
-    pub fn to_search_paths(
-        &self,
-        system: &dyn System,
-        vendored: &VendoredFileSystem,
-    ) -> Result<SearchPaths, SearchPathSettingsError> {
-        SearchPaths::from_settings(self, system, vendored)
-    }
-}
-
-/// Enumeration describing the various ways in which validation of the search paths options might fail.
-///
-/// If validation fails for a search path derived from the user settings,
-/// a message must be displayed to the user,
-/// as type checking cannot be done reliably in these circumstances.
-#[derive(Debug, thiserror::Error)]
-pub enum SearchPathSettingsError {
-    #[error(transparent)]
-    InvalidSearchPath(#[from] SearchPathError),
-
-    /// The typeshed path provided by the user is a directory,
-    /// but `stdlib/VERSIONS` could not be read.
-    /// (This is only relevant for stdlib search paths.)
-    #[error("Failed to read the custom typeshed versions file '{path}'")]
-    FailedToReadVersionsFile {
-        path: SystemPathBuf,
-        #[source]
-        error: std::io::Error,
-    },
-
-    /// The path provided by the user is a directory,
-    /// and a `stdlib/VERSIONS` file exists, but it fails to parse.
-    /// (This is only relevant for stdlib search paths.)
-    #[error(transparent)]
-    VersionsParseError(#[from] TypeshedVersionsParseError),
-}

crates/ty_project/Cargo.toml

@@ -21,9 +21,7 @@ ruff_python_ast = { workspace = true, features = ["serde"] }
 ruff_python_formatter = { workspace = true, optional = true }
 ruff_text_size = { workspace = true }
 ty_combine = { workspace = true }
-ty_module_resolver = { workspace = true }
 ty_python_semantic = { workspace = true, features = ["serde"] }
-ty_python_types = { workspace = true }
 ty_static = { workspace = true }
 ty_vendored = { workspace = true }
 

crates/ty_project/src/db.rs

@@ -14,9 +14,8 @@ use ruff_db::files::{File, Files};
 use ruff_db::system::System;
 use ruff_db::vendored::VendoredFileSystem;
 use salsa::{Database, Event, Setter};
-use ty_module_resolver::SearchPaths;
 use ty_python_semantic::lint::{LintRegistry, RuleSelection};
-use ty_python_semantic::{AnalysisSettings, Db as SemanticDb, Program};
+use ty_python_semantic::{Db as SemanticDb, Program};
 
 mod changes;
 
@@ -447,13 +446,6 @@ impl SalsaMemoryDump {
     }
 }
 
-#[salsa::db]
-impl ty_module_resolver::Db for ProjectDatabase {
-    fn search_paths(&self) -> &SearchPaths {
-        Program::get(self).search_paths(self)
-    }
-}
-
 #[salsa::db]
 impl SemanticDb for ProjectDatabase {
     fn should_check_file(&self, file: File) -> bool {
@@ -467,11 +459,7 @@ impl SemanticDb for ProjectDatabase {
     }
 
     fn lint_registry(&self) -> &LintRegistry {
-        ty_python_types::default_lint_registry()
-    }
-
-    fn analysis_settings(&self) -> &AnalysisSettings {
-        self.project().settings(self).analysis()
+        ty_python_semantic::default_lint_registry()
     }
 
     fn verbose(&self) -> bool {
@@ -535,10 +523,9 @@ pub(crate) mod tests {
     use ruff_db::files::{FileRootKind, Files};
     use ruff_db::system::{DbWithTestSystem, System, TestSystem};
     use ruff_db::vendored::VendoredFileSystem;
-    use ty_module_resolver::SearchPathSettings;
     use ty_python_semantic::lint::{LintRegistry, RuleSelection};
     use ty_python_semantic::{
-        AnalysisSettings, Program, ProgramSettings, PythonPlatform, PythonVersionWithSource,
+        Program, ProgramSettings, PythonPlatform, PythonVersionWithSource, SearchPathSettings,
     };
 
     use crate::db::Db;
@@ -640,13 +627,6 @@ pub(crate) mod tests {
         }
     }
 
-    #[salsa::db]
-    impl ty_module_resolver::Db for TestDb {
-        fn search_paths(&self) -> &ty_module_resolver::SearchPaths {
-            Program::get(self).search_paths(self)
-        }
-    }
-
     #[salsa::db]
     impl ty_python_semantic::Db for TestDb {
         fn should_check_file(&self, file: ruff_db::files::File) -> bool {
@@ -658,11 +638,7 @@ pub(crate) mod tests {
         }
 
         fn lint_registry(&self) -> &LintRegistry {
-            ty_python_types::default_lint_registry()
-        }
-
-        fn analysis_settings(&self) -> &AnalysisSettings {
-            self.project().settings(self).analysis()
+            ty_python_semantic::default_lint_registry()
         }
 
         fn verbose(&self) -> bool {

crates/ty_project/src/db/changes.rs

@@ -245,9 +245,7 @@ impl ProjectDatabase {
 
         if result.project_changed {
             let new_project_metadata = match config_file_override {
-                Some(config_file) => {
-                    ProjectMetadata::from_config_file(config_file, &project_root, self.system())
-                }
+                Some(config_file) => ProjectMetadata::from_config_file(config_file, self.system()),
                 None => ProjectMetadata::discover(&project_root, self.system()),
             };
             match new_project_metadata {

crates/ty_project/src/lib.rs

@@ -29,7 +29,7 @@ use std::sync::Arc;
 use thiserror::Error;
 use ty_python_semantic::add_inferred_python_version_hint_to_diagnostic;
 use ty_python_semantic::lint::RuleSelection;
-use ty_python_types::types::check_types;
+use ty_python_semantic::types::check_types;
 
 mod db;
 mod files;
@@ -115,10 +115,6 @@ pub struct Project {
 
     #[default]
     verbose_flag: bool,
-
-    /// Whether to enforce exclusion rules even to files explicitly passed to ty on the command line.
-    #[default]
-    force_exclude_flag: bool,
 }
 
 /// A progress reporter.
@@ -384,16 +380,6 @@ impl Project {
         self.verbose_flag(db)
     }
 
-    pub fn set_force_exclude(self, db: &mut dyn Db, force: bool) {
-        if self.force_exclude_flag(db) != force {
-            self.set_force_exclude_flag(db).to(force);
-        }
-    }
-
-    pub fn force_exclude(self, db: &dyn Db) -> bool {
-        self.force_exclude_flag(db)
-    }
-
     /// Returns the paths that should be checked.
     ///
     /// The default is to check the entire project in which case this method returns
@@ -769,7 +755,7 @@ mod tests {
     use ruff_db::system::{DbWithTestSystem, DbWithWritableSystem as _, SystemPath, SystemPathBuf};
     use ruff_db::testing::assert_function_query_was_not_run;
     use ruff_python_ast::name::Name;
-    use ty_python_types::types::check_types;
+    use ty_python_semantic::types::check_types;
 
     #[test]
     fn check_file_skips_type_checking_when_file_cant_be_read() -> ruff_db::system::Result<()> {

crates/ty_project/src/metadata.rs

@@ -56,7 +56,6 @@ impl ProjectMetadata {
 
     pub fn from_config_file(
         path: SystemPathBuf,
-        root: &SystemPath,
         system: &dyn System,
     ) -> Result<Self, ProjectMetadataError> {
         tracing::debug!("Using overridden configuration file at '{path}'");
@@ -71,8 +70,8 @@ impl ProjectMetadata {
         let options = config_file.into_options();
 
         Ok(Self {
-            name: Name::new(root.file_name().unwrap_or("root")),
-            root: root.to_path_buf(),
+            name: Name::new(system.current_directory().file_name().unwrap_or("root")),
+            root: system.current_directory().to_path_buf(),
             options,
             extra_configuration_paths: vec![path],
             misconfiguration_mode: MisconfigurationMode::Fail,

crates/ty_project/src/metadata/options.rs

@@ -28,12 +28,11 @@ use std::ops::Deref;
 use std::sync::Arc;
 use thiserror::Error;
 use ty_combine::Combine;
-use ty_module_resolver::{SearchPathSettings, SearchPathSettingsError, SearchPaths};
 use ty_python_semantic::lint::{Level, LintSource, RuleSelection};
 use ty_python_semantic::{
-    AnalysisSettings, MisconfigurationMode, ProgramSettings, PythonEnvironment, PythonPlatform,
-    PythonVersionFileSource, PythonVersionSource, PythonVersionWithSource, SitePackagesPaths,
-    SysPrefixPathOrigin,
+    MisconfigurationMode, ProgramSettings, PythonEnvironment, PythonPlatform,
+    PythonVersionFileSource, PythonVersionSource, PythonVersionWithSource, SearchPathSettings,
+    SearchPathValidationError, SearchPaths, SitePackagesPaths, SysPrefixPathOrigin,
 };
 use ty_static::EnvVars;
 
@@ -87,10 +86,6 @@ pub struct Options {
     #[option_group]
     pub terminal: Option<TerminalOptions>,
 
-    #[serde(skip_serializing_if = "Option::is_none")]
-    #[option_group]
-    pub analysis: Option<AnalysisOptions>,
-
     /// Override configurations for specific file patterns.
     ///
     /// Each override specifies include/exclude patterns and rule configurations
@@ -263,7 +258,7 @@ impl Options {
         system: &dyn System,
         vendored: &VendoredFileSystem,
         misconfiguration_mode: MisconfigurationMode,
-    ) -> Result<SearchPaths, SearchPathSettingsError> {
+    ) -> Result<SearchPaths, SearchPathValidationError> {
         let environment = self.environment.or_default();
         let src = self.src.or_default();
 
@@ -439,8 +434,6 @@ impl Options {
                 color: colored::control::SHOULD_COLORIZE.should_colorize(),
             })?;
 
-        let analysis = self.analysis.or_default().to_settings();
-
         let overrides = self
             .to_overrides_settings(db, project_root, &mut diagnostics)
             .map_err(|err| ToSettingsError {
@@ -453,7 +446,6 @@ impl Options {
             rules: Arc::new(rules),
             terminal,
             src,
-            analysis,
             overrides,
         };
 
@@ -883,7 +875,10 @@ impl Rules {
                     let lint_source = match source {
                         ValueSource::File(_) => LintSource::File,
                         ValueSource::Cli => LintSource::Cli,
-                        ValueSource::Editor => LintSource::Editor,
+
+                        ValueSource::Editor => {
+                            unreachable!("Can't configure rules from the user's editor")
+                        }
                     };
                     if let Ok(severity) = Severity::try_from(**level) {
                         selection.enable(lint, severity, lint_source);
@@ -1019,12 +1014,7 @@ fn build_include_filter(
                             SubDiagnosticSeverity::Info,
                             "The pattern was specified on the CLI",
                         )),
-                        ValueSource::Editor => {
-                            diagnostic.sub(SubDiagnostic::new(
-                                SubDiagnosticSeverity::Info,
-                                "The pattern was specified in the editor settings.",
-                            ))
-                        }
+                        ValueSource::Editor => unreachable!("Can't configure includes from the user's editor"),
                     }
                 })?;
         }
@@ -1107,10 +1097,9 @@ fn build_exclude_filter(
                             SubDiagnosticSeverity::Info,
                             "The pattern was specified on the CLI",
                         )),
-                        ValueSource::Editor => diagnostic.sub(SubDiagnostic::new(
-                            SubDiagnosticSeverity::Info,
-                            "The pattern was specified in the editor settings",
-                        ))
+                        ValueSource::Editor => unreachable!(
+                            "Can't configure excludes from the user's editor"
+                        )
                     }
                 })?;
         }
@@ -1261,55 +1250,6 @@ pub struct TerminalOptions {
     pub error_on_warning: Option<bool>,
 }
 
-#[derive(
-    Debug,
-    Default,
-    Clone,
-    Eq,
-    PartialEq,
-    Combine,
-    Serialize,
-    Deserialize,
-    OptionsMetadata,
-    get_size2::GetSize,
-)]
-#[serde(rename_all = "kebab-case", deny_unknown_fields)]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
-pub struct AnalysisOptions {
-    /// Whether ty should respect `type: ignore` comments.
-    ///
-    /// When set to `false`, `type: ignore` comments are treated like any other normal
-    /// comment and can't be used to suppress ty errors (you have to use `ty: ignore` instead).
-    ///
-    /// Setting this option can be useful when using ty alongside other type checkers or when
-    /// you prefer using `ty: ignore` over `type: ignore`.
-    ///
-    /// Defaults to `true`.
-    #[option(
-        default = r#"true"#,
-        value_type = "bool",
-        example = r#"
-        # Disable support for `type: ignore` comments
-        respect-type-ignore-comments = false
-        "#
-    )]
-    respect_type_ignore_comments: Option<bool>,
-}
-
-impl AnalysisOptions {
-    fn to_settings(&self) -> AnalysisSettings {
-        let AnalysisSettings {
-            respect_type_ignore_comments: respect_type_ignore_default,
-        } = AnalysisSettings::default();
-
-        AnalysisSettings {
-            respect_type_ignore_comments: self
-                .respect_type_ignore_comments
-                .unwrap_or(respect_type_ignore_default),
-        }
-    }
-}
-
 /// Configuration override that applies to specific files based on glob patterns.
 ///
 /// An override allows you to apply different rule configurations to specific
@@ -1666,7 +1606,7 @@ mod schema {
         fn json_schema(generator: &mut schemars::SchemaGenerator) -> schemars::Schema {
             use serde_json::{Map, Value};
 
-            let registry = ty_python_types::default_lint_registry();
+            let registry = ty_python_semantic::default_lint_registry();
             let level_schema = generator.subschema_for::<super::Level>();
 
             let properties: Map<String, Value> = registry

crates/ty_project/src/metadata/settings.rs

@@ -2,7 +2,6 @@ use std::sync::Arc;
 
 use ruff_db::files::File;
 use ty_combine::Combine;
-use ty_python_semantic::AnalysisSettings;
 use ty_python_semantic::lint::RuleSelection;
 
 use crate::metadata::options::{InnerOverrideOptions, OutputFormat};
@@ -26,7 +25,6 @@ pub struct Settings {
     pub(super) rules: Arc<RuleSelection>,
     pub(super) terminal: TerminalSettings,
     pub(super) src: SrcSettings,
-    pub(super) analysis: AnalysisSettings,
 
     /// Settings for configuration overrides that apply to specific file patterns.
     ///
@@ -56,10 +54,6 @@ impl Settings {
     pub fn overrides(&self) -> &[Override] {
         &self.overrides
     }
-
-    pub fn analysis(&self) -> &AnalysisSettings {
-        &self.analysis
-    }
 }
 
 #[derive(Debug, Clone, PartialEq, Eq, Default, get_size2::GetSize)]

crates/ty_project/src/walk.rs

@@ -111,8 +111,6 @@ pub(crate) struct ProjectFilesWalker<'a> {
     walker: WalkDirectoryBuilder,
 
     filter: ProjectFilesFilter<'a>,
-
-    force_exclude: bool,
 }
 
 impl<'a> ProjectFilesWalker<'a> {
@@ -160,11 +158,7 @@ impl<'a> ProjectFilesWalker<'a> {
             walker = walker.add(path);
         }
 
-        Some(Self {
-            walker,
-            filter,
-            force_exclude: db.project().force_exclude(db),
-        })
+        Some(Self { walker, filter })
     }
 
     /// Walks the project paths and collects the paths of all files that
@@ -185,7 +179,7 @@ impl<'a> ProjectFilesWalker<'a> {
                         // Skip excluded directories unless they were explicitly passed to the walker
                         // (which is the case passed to `ty check <paths>`).
                         if entry.file_type().is_directory() {
-                            if entry.depth() > 0 || self.force_exclude {
+                            if entry.depth() > 0 {
                                 let directory_included = filter
                                     .is_directory_included(entry.path(), GlobFilterCheckMode::TopDown);
                                 return match directory_included {
@@ -224,7 +218,7 @@ impl<'a> ProjectFilesWalker<'a> {
 
                             // For all files, except the ones that were explicitly passed to the walker (CLI),
                             // check if they're included in the project.
-                            if entry.depth() > 0 || self.force_exclude {
+                            if entry.depth() > 0 {
                                 match filter
                                     .is_file_included(entry.path(), GlobFilterCheckMode::TopDown)
                                 {

crates/ty_project/src/watch/project_watcher.rs

@@ -5,7 +5,7 @@ use tracing::info;
 
 use ruff_cache::{CacheKey, CacheKeyHasher};
 use ruff_db::system::{SystemPath, SystemPathBuf};
-use ty_module_resolver::system_module_search_paths;
+use ty_python_semantic::system_module_search_paths;
 
 use crate::db::{Db, ProjectDatabase};
 use crate::watch::Watcher;

crates/ty_python_semantic/Cargo.toml

@@ -19,11 +19,11 @@ ruff_macros = { workspace = true }
 ruff_memory_usage = { workspace = true }
 ruff_python_ast = { workspace = true, features = ["salsa"] }
 ruff_python_parser = { workspace = true }
+ruff_python_stdlib = { workspace = true }
 ruff_source_file = { workspace = true }
 ruff_text_size = { workspace = true }
+ruff_python_literal = { workspace = true }
 ruff_python_trivia = { workspace = true }
-ty_module_resolver = { workspace = true }
-ty_combine = { workspace = true }
 ty_static = { workspace = true }
 
 anyhow = { workspace = true }
@@ -31,6 +31,8 @@ bitflags = { workspace = true }
 bitvec = { workspace = true }
 camino = { workspace = true }
 colored = { workspace = true }
+compact_str = { workspace = true }
+drop_bomb = { workspace = true }
 get-size2 = { workspace = true, features = ["indexmap", "ordermap"] }
 indexmap = { workspace = true }
 itertools = { workspace = true }
@@ -44,8 +46,9 @@ schemars = { workspace = true, optional = true }
 serde = { workspace = true, optional = true }
 serde_json = { workspace = true, optional = true }
 smallvec = { workspace = true }
-ty_vendored = { workspace = true, optional = true }
 static_assertions = { workspace = true }
+test-case = { workspace = true }
+memchr = { workspace = true }
 strum = { workspace = true }
 strum_macros = { workspace = true }
 strsim = "0.11.1"
@@ -53,19 +56,29 @@ strsim = "0.11.1"
 [dev-dependencies]
 ruff_db = { workspace = true, features = ["testing", "os"] }
 ruff_python_parser = { workspace = true }
+ty_python_semantic = { workspace = true, features = ["testing"] }
+ty_static = { workspace = true }
+ty_test = { workspace = true }
 ty_vendored = { workspace = true }
+
+anyhow = { workspace = true }
+datatest-stable = { workspace = true }
+glob = { workspace = true }
+indoc = { workspace = true }
 insta = { workspace = true }
+pretty_assertions = { workspace = true }
+tempfile = { workspace = true }
 quickcheck = { version = "1.0.3", default-features = false }
 quickcheck_macros = { version = "1.0.0" }
 
 [features]
 schemars = ["dep:schemars", "dep:serde_json"]
 serde = ["ruff_db/serde", "dep:serde", "ruff_python_ast/serde"]
-testing = ["dep:ty_vendored", "ruff_db/testing"]
+testing = []
+
+[[test]]
+name = "mdtest"
+harness = false
 
 [lints]
 workspace = true
-
-[package.metadata.cargo-shear]
-# Used via macro expansion.
-ignored = ["quickcheck"]

crates/ty_python_semantic/mdtest.py

@@ -38,14 +38,8 @@ class MDTestRunner:
     console: Console
     filters: list[str]
     enable_external: bool
-    upgrade_lockfiles: bool
 
-    def __init__(
-        self,
-        filters: list[str] | None,
-        enable_external: bool,
-        upgrade_lockfiles: bool,
-    ) -> None:
+    def __init__(self, filters: list[str] | None, enable_external: bool) -> None:
         self.mdtest_executable = None
         self.console = Console()
         self.filters = [
@@ -53,7 +47,6 @@ class MDTestRunner:
             for f in (filters or [])
         ]
         self.enable_external = enable_external
-        self.upgrade_lockfiles = upgrade_lockfiles
 
     def _run_cargo_test(self, *, message_format: Literal["human", "json"]) -> str:
         return subprocess.check_output(
@@ -130,7 +123,6 @@ class MDTestRunner:
                 INSTA_FORCE_PASS="1",
                 INSTA_OUTPUT="none",
                 MDTEST_EXTERNAL="1" if self.enable_external else "0",
-                MDTEST_UPGRADE_LOCKFILES="1" if self.upgrade_lockfiles else "0",
             ),
             capture_output=capture_output,
             text=True,
@@ -268,20 +260,12 @@ def main() -> None:
         action="store_true",
         help="Enable tests with external dependencies",
     )
-    parser.add_argument(
-        "--no-lockfile-upgrades",
-        action="store_true",
-        help="By default, lockfiles will be upgraded when dependency requirements in the Markdown test change."
-        + " Set this flag to never upgrade any lockfiles.",
-    )
 
     args = parser.parse_args()
 
     try:
         runner = MDTestRunner(
-            filters=args.filters,
-            enable_external=args.enable_external,
-            upgrade_lockfiles=not args.no_lockfile_upgrades,
+            filters=args.filters, enable_external=args.enable_external
         )
         runner.watch()
     except KeyboardInterrupt: